diff options
| author | Rémi Verschelde | 2017-01-25 07:38:16 +0100 |
|---|---|---|
| committer | GitHub | 2017-01-25 07:38:16 +0100 |
| commit | 9038a96e49300ea5cc427ab8bbc6a5bd5de434cb (patch) | |
| tree | 5a06d63f0290291fbd56314f0a31133430468ad6 | |
| parent | e4efab04bbb65a7c242c0d0b469a1bcbffedf85b (diff) | |
| parent | 8f11304dfcb9e8414b781a17e7e090b757509296 (diff) | |
| download | godot-9038a96e49300ea5cc427ab8bbc6a5bd5de434cb.tar.gz godot-9038a96e49300ea5cc427ab8bbc6a5bd5de434cb.tar.zst godot-9038a96e49300ea5cc427ab8bbc6a5bd5de434cb.zip | |
Merge pull request #7632 from RandomShaper/hide-lock-icons-2.1
2D Editor: Don't show lock icons for hidden nodes (2.1)
| -rw-r--r-- | tools/editor/plugins/canvas_item_editor_plugin.cpp | 2 | ||||
| -rw-r--r-- | tools/editor/scene_tree_editor.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/editor/plugins/canvas_item_editor_plugin.cpp b/tools/editor/plugins/canvas_item_editor_plugin.cpp index 242310a85..2504dee70 100644 --- a/tools/editor/plugins/canvas_item_editor_plugin.cpp +++ b/tools/editor/plugins/canvas_item_editor_plugin.cpp @@ -2336,7 +2336,7 @@ void CanvasItemEditor::_find_canvas_items_span(Node *p_node, Rect2& r_rect, cons - if (c) { + if (c && c->is_visible()) { Rect2 rect = c->get_item_rect(); Matrix32 xform = p_xform * c->get_transform(); diff --git a/tools/editor/scene_tree_editor.cpp b/tools/editor/scene_tree_editor.cpp index 41819cb7c..85bba1399 100644 --- a/tools/editor/scene_tree_editor.cpp +++ b/tools/editor/scene_tree_editor.cpp @@ -471,6 +471,7 @@ void SceneTreeEditor::_node_visibility_changed(Node *p_node) { if (p_node->is_type("CanvasItem")) { visible = !p_node->call("is_hidden"); + CanvasItemEditor::get_singleton()->get_viewport_control()->update(); } else if (p_node->is_type("Spatial")) { visible = !p_node->call("is_hidden"); } |