add 'model-name' block property

2024-11-05 22:23:53 +03:00
parent 64369fb189
commit 423ac2c44e
5 changed files with 23 additions and 17 deletions
@@ -288,14 +288,17 @@ void Engine::loadAssets() {
    if (content) {
        for (auto& [name, def] : content->blocks.getDefs()) {
            if (def->model == BlockModel::custom) {
-                assets->store(
-                    std::make_unique<model::Model>(
-                        ModelsGenerator::loadCustomBlockModel(
-                            def->customModelRaw, *assets, !def->shadeless
-                        )
-                    ),
-                    name + ".model"
-                );
+                if (def->modelName.empty()) {
+                    assets->store(
+                        std::make_unique<model::Model>(
+                            ModelsGenerator::loadCustomBlockModel(
+                                def->customModelRaw, *assets, !def->shadeless
+                            )
+                        ),
+                        name + ".model"
+                    );
+                    def->modelName = def->name + ".model";
+                }
            }
        }
        for (auto& [name, def] : content->items.getDefs()) {