godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Allow Viewport children to lock, group, and key

Browse Source
This commit is contained in:
kit
2024-12-03 19:49:29 -05:00
parent 47bc374edf
commit 159d70a470
2 changed files with 0 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
editor/plugins/canvas_item_editor_plugin.cpp
View File

@@ -4366,10 +4366,6 @@ void CanvasItemEditor::_insert_animation_keys(bool p_location, bool p_rotation,
continue; continue;
} }
if (ci->get_viewport() != EditorNode::get_singleton()->get_scene_root()) {
continue;
}
if (Object::cast_to<Node2D>(ci)) { if (Object::cast_to<Node2D>(ci)) {
Node2D *n2d = Object::cast_to<Node2D>(ci); Node2D *n2d = Object::cast_to<Node2D>(ci);
@@ -4580,9 +4576,6 @@ void CanvasItemEditor::_popup_callback(int p_op) {
if (!ci || !ci->is_inside_tree()) { if (!ci || !ci->is_inside_tree()) {
continue; 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_do_method(ci, "set_meta", "_edit_lock_", true);
undo_redo->add_undo_method(ci, "remove_meta", "_edit_lock_"); 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()) { if (!ci || !ci->is_inside_tree()) {
continue; 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_do_method(ci, "remove_meta", "_edit_lock_");
undo_redo->add_undo_method(ci, "set_meta", "_edit_lock_", true); 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()) { if (!ci || !ci->is_inside_tree()) {
continue; 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_do_method(ci, "set_meta", "_edit_group_", true);
undo_redo->add_undo_method(ci, "remove_meta", "_edit_group_"); 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()) { if (!ci || !ci->is_inside_tree()) {
continue; 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_do_method(ci, "remove_meta", "_edit_group_");
undo_redo->add_undo_method(ci, "set_meta", "_edit_group_", true); undo_redo->add_undo_method(ci, "set_meta", "_edit_group_", true);
@@ -4687,10 +4671,6 @@ void CanvasItemEditor::_popup_callback(int p_op) {
continue; continue;
} }
if (ci->get_viewport() != EditorNode::get_singleton()->get_scene_root()) {
continue;
}
if (Object::cast_to<Node2D>(ci)) { if (Object::cast_to<Node2D>(ci)) {
Node2D *n2d = Object::cast_to<Node2D>(ci); Node2D *n2d = Object::cast_to<Node2D>(ci);
PoseClipboard pc; PoseClipboard pc;
@@ -4733,10 +4713,6 @@ void CanvasItemEditor::_popup_callback(int p_op) {
continue; continue;
} }
if (ci->get_viewport() != EditorNode::get_singleton()->get_scene_root()) {
continue;
}
if (Object::cast_to<Node2D>(ci)) { if (Object::cast_to<Node2D>(ci)) {
Node2D *n2d = Object::cast_to<Node2D>(ci); Node2D *n2d = Object::cast_to<Node2D>(ci);

16
editor/plugins/node_3d_editor_plugin.cpp
View File

@@ -6771,10 +6771,6 @@ void Node3DEditor::_menu_item_pressed(int p_option) {
continue; 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_do_method(spatial, "set_meta", "_edit_lock_", true);
undo_redo->add_undo_method(spatial, "remove_meta", "_edit_lock_"); undo_redo->add_undo_method(spatial, "remove_meta", "_edit_lock_");
undo_redo->add_do_method(this, "emit_signal", "item_lock_status_changed"); 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; 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_do_method(spatial, "remove_meta", "_edit_lock_");
undo_redo->add_undo_method(spatial, "set_meta", "_edit_lock_", true); undo_redo->add_undo_method(spatial, "set_meta", "_edit_lock_", true);
undo_redo->add_do_method(this, "emit_signal", "item_lock_status_changed"); 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; 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_do_method(spatial, "set_meta", "_edit_group_", true);
undo_redo->add_undo_method(spatial, "remove_meta", "_edit_group_"); undo_redo->add_undo_method(spatial, "remove_meta", "_edit_group_");
undo_redo->add_do_method(this, "emit_signal", "item_group_status_changed"); 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; 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_do_method(spatial, "remove_meta", "_edit_group_");
undo_redo->add_undo_method(spatial, "set_meta", "_edit_group_", true); undo_redo->add_undo_method(spatial, "set_meta", "_edit_group_", true);
undo_redo->add_do_method(this, "emit_signal", "item_group_status_changed"); undo_redo->add_do_method(this, "emit_signal", "item_group_status_changed");