diff options
| author | MarianoGNU <marianognu.easyrpg@gmail.com> | 2015-10-17 23:38:33 -0300 |
|---|---|---|
| committer | MarianoGNU <marianognu.easyrpg@gmail.com> | 2015-10-17 23:38:33 -0300 |
| commit | 4452e262539ad9d52a5980305584d897829986d1 (patch) | |
| tree | cde7f3bdc36e727a21f55938a131083f84e043a6 /tools/editor/scene_tree_dock.cpp | |
| parent | 68fb30aaea0acf3ff279831d2d77b2e7129e4b69 (diff) | |
| parent | 97f483af0a3e040f73c2df957bd092af2f6c085b (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'tools/editor/scene_tree_dock.cpp')
| -rw-r--r-- | tools/editor/scene_tree_dock.cpp | 2 |
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!"); |