diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index fd67e4b832..9d54e72b3f 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -4384,10 +4384,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); @@ -4598,9 +4594,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_"); @@ -4620,9 +4613,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); @@ -4642,9 +4632,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_"); @@ -4664,9 +4651,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); @@ -4705,10 +4689,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; @@ -4751,10 +4731,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 a1c2158678..43357c82e3 100644 --- a/editor/plugins/node_3d_editor_plugin.cpp +++ b/editor/plugins/node_3d_editor_plugin.cpp @@ -6894,10 +6894,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"); @@ -6919,10 +6915,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"); @@ -6944,10 +6936,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"); @@ -6968,10 +6956,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");