summaryrefslogtreecommitdiff
path: root/tools/editor
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-10-17 15:48:42 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-10-17 15:48:42 -0300
commit85a611d1cd186f7f424f7e00d244adb3b2d7bb30 (patch)
treeff952ce43cc14ba7548b145facdd17da5e5d98b2 /tools/editor
parent6f9631fc5151b3267c6fcea5f70249fc36814db8 (diff)
-fixes disability to remove instanced nodes when reopening scene. Fixes #2610
Diffstat (limited to 'tools/editor')
-rw-r--r--tools/editor/scene_tree_dock.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/editor/scene_tree_dock.cpp b/tools/editor/scene_tree_dock.cpp
index 920ab599e9..510517de6f 100644
--- a/tools/editor/scene_tree_dock.cpp
+++ b/tools/editor/scene_tree_dock.cpp
@@ -875,7 +875,7 @@ bool SceneTreeDock::_validate_no_foreign() {
}
- if (edited_scene->get_scene_instance_state().is_valid() && edited_scene->get_scene_instance_state()->find_node_by_path(edited_scene->get_path_to(E->get()))>=0) {
+ if (edited_scene->get_scene_inherited_state().is_valid() && edited_scene->get_scene_inherited_state()->find_node_by_path(edited_scene->get_path_to(E->get()))>=0) {
accept->get_ok()->set_text("Makes Sense!");
accept->set_text("Can't operate on nodes the current scene inherits from!");