summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Chabora <kobewi4e@gmail.com>2019-04-08 18:43:55 +0200
committerTomasz Chabora <kobewi4e@gmail.com>2019-04-08 18:43:55 +0200
commit82fadde680c9377e0a8da023a66c921174c97aff (patch)
treed9c2b41e844bf7832b0eeea4d08af6a98f43d34c
parent6574c557c962d9e4dd726b494322aea246a0245a (diff)
Use filename for scene root of imported models
-rw-r--r--editor/import/resource_importer_scene.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/editor/import/resource_importer_scene.cpp b/editor/import/resource_importer_scene.cpp
index 5eb1d2ec6c..2f3d8cf58d 100644
--- a/editor/import/resource_importer_scene.cpp
+++ b/editor/import/resource_importer_scene.cpp
@@ -1256,7 +1256,10 @@ Error ResourceImporterScene::import(const String &p_source_file, const String &p
Object::cast_to<Spatial>(scene)->scale(Vector3(root_scale, root_scale, root_scale));
}
- scene->set_name(p_options["nodes/root_name"]);
+ if (p_options["nodes/root_name"] != "Scene Root")
+ scene->set_name(p_options["nodes/root_name"]);
+ else
+ scene->set_name(p_save_path.get_file().get_basename());
err = OK;