Przeglądaj źródła

Merge pull request #12823 from Web-eWorks/meshdropfix

Fix #12571: Dragging OBJ mesh files no longer instances a scene
Rémi Verschelde 7 lat temu
rodzic
commit
31117588fd
1 zmienionych plików z 3 dodań i 1 usunięć
  1. 3 1
      editor/plugins/spatial_editor_plugin.cpp

+ 3 - 1
editor/plugins/spatial_editor_plugin.cpp

@@ -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());