godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-01 16:38:31 +00:00
Code Releases Wiki Activity

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

Browse Source 
Fix lock or group with invisible node
This commit is contained in:
Rémi Verschelde
2018-01-03 12:35:12 +01:00
committed by GitHub
parent 4be31e37b0 108b4a37b0
commit 8cf9269cdb
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
editor/plugins/canvas_item_editor_plugin.cpp
View File

@@ -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())