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

Merge pull request #12823 from Web-eWorks/meshdropfix

Browse source 
Fix #12571: Dragging OBJ mesh files no longer instances a scene
This commit is contained in:
Rémi Verschelde 2017-11-12 20:31:51 +01:00 committed by GitHub
commit 31117588fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
editor/plugins/spatial_editor_plugin.cpp
View file

@ -2917,7 +2917,9 @@ bool SpatialEditorViewport::_create_instance(Node *parent, String &path, const P
}
}
instanced_scene->set_filename(ProjectSettings::get_singleton()->localize_path(path));
if (scene != NULL) {
instanced_scene->set_filename(ProjectSettings::get_singleton()->localize_path(path));
}
editor_data->get_undo_redo().add_do_method(parent, "add_child", instanced_scene);
editor_data->get_undo_redo().add_do_method(instanced_scene, "set_owner", editor->get_edited_scene());