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

Merge pull request #99994 from kitbdev/fix-editor-viewport-group-anim

Browse Source 
Allow Viewport children to lock, group, and insert keyframes
This commit is contained in:
Rémi Verschelde
2025-01-03 00:48:09 +01:00
parent 7ccc00d787 159d70a470
commit 442f11462d
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

@@ -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<Node2D>(ci)) {
Node2D *n2d = Object::cast_to<Node2D>(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<Node2D>(ci)) {
Node2D *n2d = Object::cast_to<Node2D>(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<Node2D>(ci)) {
Node2D *n2d = Object::cast_to<Node2D>(ci);

16
editor/plugins/node_3d_editor_plugin.cpp
View File

@@ -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");