-Fixed bug with scene inheritance, should work again

-Proper .tscn and .tres parsing, should work, please test well!

1 files changed, 4 insertions, 3 deletions

diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index 01e53ead18..9d4cb2c8a2 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -3543,13 +3543,14 @@ Error EditorNode::load_scene(const String& p_scene, bool p_ignore_broken_deps,bo
 
 	if (p_set_inherited) {
 		Ref<SceneState> state = sdata->get_state();
-		state->set_path(lpath);
+		state->set_path(lpath);		
 		new_scene->set_scene_inherited_state(state);
 		new_scene->set_filename(String());
-		if (new_scene->get_scene_instance_state().is_valid())
-			new_scene->get_scene_instance_state()->set_path(String());
+		//if (new_scene->get_scene_instance_state().is_valid())
+		//	new_scene->get_scene_instance_state()->set_path(String());
 	}
 
+	new_scene->set_scene_instance_state(Ref<SceneState>());
 
 	set_edited_scene(new_scene);
 	_get_scene_metadata();