summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNounours Heureux <schtroumps31@gmail.com>2016-01-02 23:42:41 +0100
committerNounours Heureux <schtroumps31@gmail.com>2016-01-06 17:46:45 +0100
commitf32a06e470f74f7cb209568c0cc215bd339db96c (patch)
treeb7fa623d65e5ff1dc8068e4b45f5375722565ac9
parent8fb70142e41ab09cd3c6fc3b4545a3be66276be8 (diff)
You can create an inherited scene based on an already opened scene.
-rw-r--r--tools/editor/editor_node.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index 9151e63df6..318f3505cc 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -3533,11 +3533,13 @@ Error EditorNode::load_scene(const String& p_scene, bool p_ignore_broken_deps,bo
}
- for(int i=0;i<editor_data.get_edited_scene_count();i++) {
+ if(!p_set_inherited) {
+ for(int i=0;i<editor_data.get_edited_scene_count();i++) {
- if (editor_data.get_scene_path(i)==p_scene) {
- _scene_tab_changed(i);
- return OK;
+ if (editor_data.get_scene_path(i)==p_scene) {
+ _scene_tab_changed(i);
+ return OK;
+ }
}
}