From 7aa39b7cae364347cf379bb8f216adf0a79f37c7 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sat, 28 Nov 2015 20:56:14 -0300 Subject: -Fixed bug with scene inheritance, should work again -Proper .tscn and .tres parsing, should work, please test well! --- tools/editor/editor_node.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'tools/editor/editor_node.cpp') 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 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()); set_edited_scene(new_scene); _get_scene_metadata(); -- cgit v1.2.3