diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-19 19:37:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-19 19:37:16 +0100 |
| commit | 72a02555850016ab792cf498c5370983d3b72832 (patch) | |
| tree | 339cfdcaa4736a492d286e0000d285db7dd3fa34 | |
| parent | 8e84e53ebb676e43adc7ac4b3e8791790f555695 (diff) | |
| parent | a043ce7304c4a9b56b5d79efa4cca05160339e72 (diff) | |
Merge pull request #7576 from Hinsbart/hide_lock_icons
2D Editor: Don't show lock icons for hidden nodes.
| -rw-r--r-- | tools/editor/plugins/canvas_item_editor_plugin.cpp | 2 | ||||
| -rw-r--r-- | tools/editor/scene_tree_editor.cpp | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tools/editor/plugins/canvas_item_editor_plugin.cpp b/tools/editor/plugins/canvas_item_editor_plugin.cpp index 9dbd2513a0..bec7956b8c 100644 --- a/tools/editor/plugins/canvas_item_editor_plugin.cpp +++ b/tools/editor/plugins/canvas_item_editor_plugin.cpp @@ -2354,7 +2354,7 @@ void CanvasItemEditor::_find_canvas_items_span(Node *p_node, Rect2& r_rect, cons - if (c) { + if (c && c->is_visible_in_tree()) { Rect2 rect = c->get_item_rect(); Transform2D xform = p_xform * c->get_transform(); diff --git a/tools/editor/scene_tree_editor.cpp b/tools/editor/scene_tree_editor.cpp index f92cfa00c1..dd1fdeb400 100644 --- a/tools/editor/scene_tree_editor.cpp +++ b/tools/editor/scene_tree_editor.cpp @@ -470,7 +470,10 @@ void SceneTreeEditor::_node_visibility_changed(Node *p_node) { bool visible=false; - if (p_node->is_class("CanvasItem") || p_node->is_class("Spatial")) { + if (p_node->is_class("CanvasItem")) { + visible = p_node->call("is_visible"); + CanvasItemEditor::get_singleton()->get_viewport_control()->update(); + } else if (p_node->is_class("Spatial")) { visible = p_node->call("is_visible"); } |