浏览代码

Merge pull request #7632 from RandomShaper/hide-lock-icons-2.1

2D Editor: Don't show lock icons for hidden nodes (2.1)
Rémi Verschelde 8 年之前
父节点
当前提交
9038a96e49
共有 2 个文件被更改,包括 2 次插入1 次删除
  1. 1 1
      tools/editor/plugins/canvas_item_editor_plugin.cpp
  2. 1 0
      tools/editor/scene_tree_editor.cpp

+ 1 - 1
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();

+ 1 - 0
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");
 	}