diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-03-03 13:51:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-03 13:51:09 +0100 |
| commit | 86f4fabd468d107ca2546cd11c3232811764dd1d (patch) | |
| tree | a8e5ed0a6d8be2bf551f22d8c23d116322c38667 /editor/import/resource_importer_scene.cpp | |
| parent | 88e0bed081b1b48c4f0e5caaaba53fc71ee3b23c (diff) | |
| parent | b6fe7a794d111265d87467f198c6b4d887dd530a (diff) | |
Merge pull request #26446 from QbieShay/root_node_from_escn
Importer for scenes only overrides the base Node if differently specified by the user
Diffstat (limited to 'editor/import/resource_importer_scene.cpp')
| -rw-r--r-- | editor/import/resource_importer_scene.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/import/resource_importer_scene.cpp b/editor/import/resource_importer_scene.cpp index 76552575da..5eb1d2ec6c 100644 --- a/editor/import/resource_importer_scene.cpp +++ b/editor/import/resource_importer_scene.cpp @@ -1240,7 +1240,7 @@ Error ResourceImporterScene::import(const String &p_source_file, const String &p String root_type = p_options["nodes/root_type"]; - if (scene->get_class() != root_type) { + if (root_type != "Spatial") { Node *base_node = Object::cast_to<Node>(ClassDB::instance(root_type)); if (base_node) { |