Procházet zdrojové kódy

Merge pull request #15225 from volzhs/lock-group-invisible-node

Fix lock or group with invisible node
Rémi Verschelde před 7 roky
rodič
revize
8cf9269cdb
1 změnil soubory, kde provedl 4 přidání a 4 odebrání
  1. 4 4
      editor/plugins/canvas_item_editor_plugin.cpp

+ 4 - 4
editor/plugins/canvas_item_editor_plugin.cpp

@@ -3468,7 +3468,7 @@ void CanvasItemEditor::_popup_callback(int p_op) {
 			for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
 			for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
 
 
 				CanvasItem *canvas_item = Object::cast_to<CanvasItem>(E->get());
 				CanvasItem *canvas_item = Object::cast_to<CanvasItem>(E->get());
-				if (!canvas_item || !canvas_item->is_visible_in_tree())
+				if (!canvas_item || !canvas_item->is_inside_tree())
 					continue;
 					continue;
 
 
 				if (canvas_item->get_viewport() != EditorNode::get_singleton()->get_scene_root())
 				if (canvas_item->get_viewport() != EditorNode::get_singleton()->get_scene_root())
@@ -3486,7 +3486,7 @@ void CanvasItemEditor::_popup_callback(int p_op) {
 			for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
 			for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
 
 
 				CanvasItem *canvas_item = Object::cast_to<CanvasItem>(E->get());
 				CanvasItem *canvas_item = Object::cast_to<CanvasItem>(E->get());
-				if (!canvas_item || !canvas_item->is_visible_in_tree())
+				if (!canvas_item || !canvas_item->is_inside_tree())
 					continue;
 					continue;
 
 
 				if (canvas_item->get_viewport() != EditorNode::get_singleton()->get_scene_root())
 				if (canvas_item->get_viewport() != EditorNode::get_singleton()->get_scene_root())
@@ -3506,7 +3506,7 @@ void CanvasItemEditor::_popup_callback(int p_op) {
 			for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
 			for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
 
 
 				CanvasItem *canvas_item = Object::cast_to<CanvasItem>(E->get());
 				CanvasItem *canvas_item = Object::cast_to<CanvasItem>(E->get());
-				if (!canvas_item || !canvas_item->is_visible_in_tree())
+				if (!canvas_item || !canvas_item->is_inside_tree())
 					continue;
 					continue;
 
 
 				if (canvas_item->get_viewport() != EditorNode::get_singleton()->get_scene_root())
 				if (canvas_item->get_viewport() != EditorNode::get_singleton()->get_scene_root())
@@ -3524,7 +3524,7 @@ void CanvasItemEditor::_popup_callback(int p_op) {
 			for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
 			for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
 
 
 				CanvasItem *canvas_item = Object::cast_to<CanvasItem>(E->get());
 				CanvasItem *canvas_item = Object::cast_to<CanvasItem>(E->get());
-				if (!canvas_item || !canvas_item->is_visible_in_tree())
+				if (!canvas_item || !canvas_item->is_inside_tree())
 					continue;
 					continue;
 
 
 				if (canvas_item->get_viewport() != EditorNode::get_singleton()->get_scene_root())
 				if (canvas_item->get_viewport() != EditorNode::get_singleton()->get_scene_root())