summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-10-21 16:52:43 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-10-21 16:52:43 -0300
commit35959f9c5a314effc9a442931baccec2408b8ece (patch)
tree22375896183f8ce7821bba81a20eeac5e124dc1d /tools
parentb59c86f6f953ce6957bccbcc1ec6f3ce4c55572d (diff)
-fixes to ring buffer (fixes network error)
-fixes to invalid disabling of commands on scene tree dock
Diffstat (limited to 'tools')
-rw-r--r--tools/editor/scene_tree_dock.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/editor/scene_tree_dock.cpp b/tools/editor/scene_tree_dock.cpp
index 510517de6f..08aa68d792 100644
--- a/tools/editor/scene_tree_dock.cpp
+++ b/tools/editor/scene_tree_dock.cpp
@@ -1088,7 +1088,8 @@ void SceneTreeDock::_delete_confirm() {
void SceneTreeDock::_update_tool_buttons() {
Node *sel = scene_tree->get_selected();
- bool disable = !sel || (sel!=edited_scene && sel->get_owner()!=edited_scene) || (edited_scene->get_scene_instance_state().is_valid() && edited_scene->get_scene_instance_state()->find_node_by_path(edited_scene->get_path_to(sel))>=0);
+ bool disable = !sel || (sel!=edited_scene && sel->get_owner()!=edited_scene);
+ disable = disable || (edited_scene->get_scene_inherited_state().is_valid() && edited_scene->get_scene_inherited_state()->find_node_by_path(edited_scene->get_path_to(sel))>=0);
bool disable_root = disable || sel->get_parent()==scene_root;
bool disable_edit = !sel;