godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-12 13:20:55 +00:00
Code Releases Wiki Activity

-Fixed bug with scene inheritance, should work again

Browse Source 
-Proper .tscn and .tres parsing, should work, please test well!
This commit is contained in:
Juan Linietsky
2015-11-28 20:56:14 -03:00
parent bd10df93ec
commit 7aa39b7cae
7 changed files with 812 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/editor/editor_node.cpp
View File

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