diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-04-30 11:38:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-30 11:38:32 +0200 |
| commit | 6ee5f7c8819847615c5e96ed92a2a86737350459 (patch) | |
| tree | adce236198c540794daa7c5f40332f9748162861 | |
| parent | 7e0c97e73b223d28204fc67672ebae157af1f96c (diff) | |
| parent | 82fadde680c9377e0a8da023a66c921174c97aff (diff) | |
Merge pull request #27453 from KoBeWi/glhf_scene_root
Use filename for scene root of imported models
| -rw-r--r-- | editor/import/resource_importer_scene.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/editor/import/resource_importer_scene.cpp b/editor/import/resource_importer_scene.cpp index 8f66cce39a..1de276b940 100644 --- a/editor/import/resource_importer_scene.cpp +++ b/editor/import/resource_importer_scene.cpp @@ -1290,7 +1290,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; |