From 159d70a47030859b80a9598fd0cc2cdeefd487cf Mon Sep 17 00:00:00 2001 From: kit Date: Tue, 3 Dec 2024 19:49:29 -0500 Subject: [PATCH] Allow Viewport children to lock, group, and key --- editor/plugins/canvas_item_editor_plugin.cpp | 24 -------------------- editor/plugins/node_3d_editor_plugin.cpp | 16 ------------- 2 files changed, 40 deletions(-) diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index 5b948d9b7cc..129dee133c8 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -4366,10 +4366,6 @@ void CanvasItemEditor::_insert_animation_keys(bool p_location, bool p_rotation, continue; } - if (ci->get_viewport() != EditorNode::get_singleton()->get_scene_root()) { - continue; - } - if (Object::cast_to(ci)) { Node2D *n2d = Object::cast_to(ci); @@ -4580,9 +4576,6 @@ void CanvasItemEditor::_popup_callback(int p_op) { if (!ci || !ci->is_inside_tree()) { continue; } - if (ci->get_viewport() != EditorNode::get_singleton()->get_scene_root()) { - continue; - } undo_redo->add_do_method(ci, "set_meta", "_edit_lock_", true); undo_redo->add_undo_method(ci, "remove_meta", "_edit_lock_"); @@ -4602,9 +4595,6 @@ void CanvasItemEditor::_popup_callback(int p_op) { if (!ci || !ci->is_inside_tree()) { continue; } - if (ci->get_viewport() != EditorNode::get_singleton()->get_scene_root()) { - continue; - } undo_redo->add_do_method(ci, "remove_meta", "_edit_lock_"); undo_redo->add_undo_method(ci, "set_meta", "_edit_lock_", true); @@ -4624,9 +4614,6 @@ void CanvasItemEditor::_popup_callback(int p_op) { if (!ci || !ci->is_inside_tree()) { continue; } - if (ci->get_viewport() != EditorNode::get_singleton()->get_scene_root()) { - continue; - } undo_redo->add_do_method(ci, "set_meta", "_edit_group_", true); undo_redo->add_undo_method(ci, "remove_meta", "_edit_group_"); @@ -4646,9 +4633,6 @@ void CanvasItemEditor::_popup_callback(int p_op) { if (!ci || !ci->is_inside_tree()) { continue; } - if (ci->get_viewport() != EditorNode::get_singleton()->get_scene_root()) { - continue; - } undo_redo->add_do_method(ci, "remove_meta", "_edit_group_"); undo_redo->add_undo_method(ci, "set_meta", "_edit_group_", true); @@ -4687,10 +4671,6 @@ void CanvasItemEditor::_popup_callback(int p_op) { continue; } - if (ci->get_viewport() != EditorNode::get_singleton()->get_scene_root()) { - continue; - } - if (Object::cast_to(ci)) { Node2D *n2d = Object::cast_to(ci); PoseClipboard pc; @@ -4733,10 +4713,6 @@ void CanvasItemEditor::_popup_callback(int p_op) { continue; } - if (ci->get_viewport() != EditorNode::get_singleton()->get_scene_root()) { - continue; - } - if (Object::cast_to(ci)) { Node2D *n2d = Object::cast_to(ci); diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp index 5d11cc7bc5a..e50eebb4d75 100644 --- a/editor/plugins/node_3d_editor_plugin.cpp +++ b/editor/plugins/node_3d_editor_plugin.cpp @@ -6771,10 +6771,6 @@ void Node3DEditor::_menu_item_pressed(int p_option) { continue; } - if (spatial->get_viewport() != EditorNode::get_singleton()->get_scene_root()) { - continue; - } - undo_redo->add_do_method(spatial, "set_meta", "_edit_lock_", true); undo_redo->add_undo_method(spatial, "remove_meta", "_edit_lock_"); undo_redo->add_do_method(this, "emit_signal", "item_lock_status_changed"); @@ -6796,10 +6792,6 @@ void Node3DEditor::_menu_item_pressed(int p_option) { continue; } - if (spatial->get_viewport() != EditorNode::get_singleton()->get_scene_root()) { - continue; - } - undo_redo->add_do_method(spatial, "remove_meta", "_edit_lock_"); undo_redo->add_undo_method(spatial, "set_meta", "_edit_lock_", true); undo_redo->add_do_method(this, "emit_signal", "item_lock_status_changed"); @@ -6821,10 +6813,6 @@ void Node3DEditor::_menu_item_pressed(int p_option) { continue; } - if (spatial->get_viewport() != EditorNode::get_singleton()->get_scene_root()) { - continue; - } - undo_redo->add_do_method(spatial, "set_meta", "_edit_group_", true); undo_redo->add_undo_method(spatial, "remove_meta", "_edit_group_"); undo_redo->add_do_method(this, "emit_signal", "item_group_status_changed"); @@ -6845,10 +6833,6 @@ void Node3DEditor::_menu_item_pressed(int p_option) { continue; } - if (spatial->get_viewport() != EditorNode::get_singleton()->get_scene_root()) { - continue; - } - undo_redo->add_do_method(spatial, "remove_meta", "_edit_group_"); undo_redo->add_undo_method(spatial, "set_meta", "_edit_group_", true); undo_redo->add_do_method(this, "emit_signal", "item_group_status_changed");