godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3208 from nounoursheureux/master 

You can now create an inherited scene based on an already opened scene
This commit is contained in:
Rémi Verschelde 2016-01-06 18:31:33 +01:00
parent 1fe9f626e1 f32a06e470
commit bc3b1a63ba
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/editor/editor_node.cpp
View File

@ -3535,6 +3535,7 @@ Error EditorNode::load_scene(const String& p_scene, bool p_ignore_broken_deps,bo
} }
if(!p_set_inherited) {
for(int i=0;i<editor_data.get_edited_scene_count();i++) { for(int i=0;i<editor_data.get_edited_scene_count();i++) {
if (editor_data.get_scene_path(i)==p_scene) { if (editor_data.get_scene_path(i)==p_scene) {
@ -3542,6 +3543,7 @@ Error EditorNode::load_scene(const String& p_scene, bool p_ignore_broken_deps,bo
return OK; return OK;
} }
} }
}
load_errors->clear(); load_errors->clear();