Sfoglia il codice sorgente

Merge pull request #11721 from groud/Fix_node2D_lock

Fixes node2D not lockable/groupable
Poommetee Ketson 8 anni fa
parent
commit
9f1a5e71a6
1 ha cambiato i file con 2 aggiunte e 2 eliminazioni
  1. 2 2
      editor/plugins/canvas_item_editor_plugin.cpp

+ 2 - 2
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;
 			}