diff options
| author | Poommetee Ketson <poommetee@protonmail.com> | 2017-09-30 22:06:26 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-30 22:06:26 +0700 |
| commit | 9f1a5e71a68c646327a23a1d77deb0d34e335a11 (patch) | |
| tree | d1c9a1ab575c210a05ed6007907139e505ef3ebe /editor/plugins | |
| parent | 313b1a639c808677ee4bdca83e35ce645a23d1a2 (diff) | |
| parent | c9e1bff93f86b30074ce178a1a7ef2cffe3b14a5 (diff) | |
Merge pull request #11721 from groud/Fix_node2D_lock
Fixes node2D not lockable/groupable
Diffstat (limited to 'editor/plugins')
| -rw-r--r-- | editor/plugins/canvas_item_editor_plugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index b6b112b905..f3006938a8 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -2668,13 +2668,13 @@ void CanvasItemEditor::_draw_viewport() { all_group = false; } else { for (List<Node *>::Element *E = selection.front(); E; E = E->next()) { - if (Object::cast_to<Control>(E->get()) && !Object::cast_to<Control>(E->get())->has_meta("_edit_lock_")) { + if (Object::cast_to<CanvasItem>(E->get()) && !Object::cast_to<CanvasItem>(E->get())->has_meta("_edit_lock_")) { all_locked = false; break; } } for (List<Node *>::Element *E = selection.front(); E; E = E->next()) { - if (Object::cast_to<Control>(E->get()) && !Object::cast_to<Control>(E->get())->has_meta("_edit_group_")) { + if (Object::cast_to<CanvasItem>(E->get()) && !Object::cast_to<CanvasItem>(E->get())->has_meta("_edit_group_")) { all_group = false; break; } |