diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-02-11 14:35:54 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-02-11 14:35:54 +0100 |
| commit | 7bcd9a10498655b63ffddfc560b1adc425f33117 (patch) | |
| tree | efc4727abd25e8b5b004a02fa3d60c497d6dd207 | |
| parent | 7725a1a14cd316552f8b379d5e7efca5d56266ae (diff) | |
| parent | be916233f9022cb527cd053339102e141497761f (diff) | |
Merge pull request #73082 from aaronfranke/check-canvas-item
Check for CanvasItem instead of Control and Node2D
| -rw-r--r-- | editor/editor_node.cpp | 2 | ||||
| -rw-r--r-- | scene/resources/tile_set.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 3adebb2f8e..1dce65cfab 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -3685,7 +3685,7 @@ void EditorNode::_set_main_scene_state(Dictionary p_state, Node *p_for_scene) { Node *editor_node = SceneTreeDock::get_singleton()->get_tree_editor()->get_selected(); editor_node = editor_node == nullptr ? get_edited_scene() : editor_node; - if (Object::cast_to<Node2D>(editor_node) || Object::cast_to<Control>(editor_node)) { + if (Object::cast_to<CanvasItem>(editor_node)) { editor_select(EDITOR_2D); } else if (Object::cast_to<Node3D>(editor_node)) { editor_select(EDITOR_3D); diff --git a/scene/resources/tile_set.cpp b/scene/resources/tile_set.cpp index 58a638804d..fee0a4a910 100644 --- a/scene/resources/tile_set.cpp +++ b/scene/resources/tile_set.cpp @@ -4805,8 +4805,8 @@ void TileSetScenesCollectionSource::set_scene_tile_scene(int p_id, Ref<PackedSce scene_state = scene_state->get_base_scene_state(); } ERR_FAIL_COND_MSG(type.is_empty(), vformat("Invalid PackedScene for TileSetScenesCollectionSource: %s. Could not get the type of the root node.", p_packed_scene->get_path())); - bool extends_correct_class = ClassDB::is_parent_class(type, "Control") || ClassDB::is_parent_class(type, "Node2D"); - ERR_FAIL_COND_MSG(!extends_correct_class, vformat("Invalid PackedScene for TileSetScenesCollectionSource: %s. Root node should extend Control or Node2D. Found %s instead.", p_packed_scene->get_path(), type)); + bool extends_correct_class = ClassDB::is_parent_class(type, "CanvasItem"); + ERR_FAIL_COND_MSG(!extends_correct_class, vformat("Invalid PackedScene for TileSetScenesCollectionSource: %s. Root node should extend CanvasItem. Found %s instead.", p_packed_scene->get_path(), type)); scenes[p_id].scene = p_packed_scene; } else { |