diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-01-06 18:31:33 +0100 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-01-06 18:31:33 +0100 |
| commit | bc3b1a63baff039cade57d742b03c331093965b3 (patch) | |
| tree | 0cf9f7b944710a8d0d6b64dfb19b42aae43426c0 /tools/editor | |
| parent | 1fe9f626e116d0ff2d373f54c8265f5b8c2ca833 (diff) | |
| parent | f32a06e470f74f7cb209568c0cc215bd339db96c (diff) | |
Merge pull request #3208 from nounoursheureux/master
You can now create an inherited scene based on an already opened scene
Diffstat (limited to 'tools/editor')
| -rw-r--r-- | tools/editor/editor_node.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 11343d6346..9fe0409c0e 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -3535,11 +3535,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; + } } } |