From c9e1bff93f86b30074ce178a1a7ef2cffe3b14a5 Mon Sep 17 00:00:00 2001
From: Gilles Roudiere <gilles.roudiere@gmail.com>
Date: Sat, 30 Sep 2017 15:30:51 +0200
Subject: Fixes node2D not lockable/groupable

---
 editor/plugins/canvas_item_editor_plugin.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'editor/plugins')

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;
 			}
-- 
cgit v1.2.3