asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #26446 from QbieShay/root_node_from_escn

Browse source 
Importer for scenes only overrides the base Node if differently specified by the user
This commit is contained in:
Rémi Verschelde 2019-03-03 13:51:09 +01:00 committed by GitHub
commit 86f4fabd46
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
editor/import/resource_importer_scene.cpp
View file

@ -1240,7 +1240,7 @@ Error ResourceImporterScene::import(const String &p_source_file, const String &p
String root_type = p_options["nodes/root_type"]; 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)); Node *base_node = Object::cast_to<Node>(ClassDB::instance(root_type));
if (base_node) { if (base_node) {