noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #119176 from ryevdokimov/lock-transform

Browse Source 
Fix 3D transform gizmo visibility after node lock/unlock
This commit is contained in:
Thaddeus Crews
2026-06-18 15:14:19 -05:00
parent 685c3eedb7 363c95ce13
commit bbeb4a2557
3 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/scene/3d/node_3d_editor_plugin.cpp
+21 -2
View File
@@ -599,6 +599,17 @@ int Node3DEditorViewport::get_selected_count() const {
return count;
}
bool Node3DEditorViewport::_has_unlocked_selection() const {
const List<Node *> &selection = editor_selection->get_top_selected_node_list();
for (Node *E : selection) {
Node3D *sp = Object::cast_to<Node3D>(E);
if (sp && !_is_node_locked(sp)) {
return true;
}
}
return false;
}
void Node3DEditorViewport::cancel_transform() {
const List<Node *> &selection = editor_selection->get_top_selected_node_list();
@@ -2733,7 +2744,7 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
bool is_select_mode = (spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_TRANSFORM);
bool is_clicked_selected = editor_selection->is_selected(ObjectDB::get_instance<Node>(clicked));
if (_edit.mode == TRANSFORM_NONE && (is_select_mode || is_clicked_selected)) {
if (_edit.mode == TRANSFORM_NONE && (is_select_mode || is_clicked_selected) && _has_unlocked_selection()) {
_compute_edit(_edit.original_mouse_pos);
clicked = ObjectID();
_edit.mode = TRANSFORM_TRANSLATE;
@@ -3001,7 +3012,7 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
begin_transform(TRANSFORM_SCALE, true);
}
}
if (ED_IS_SHORTCUT("spatial_editor/collision_reposition", event_mod) && editor_selection->get_top_selected_node_list().size() == 1 && !collision_reposition) {
if (ED_IS_SHORTCUT("spatial_editor/collision_reposition", event_mod) && editor_selection->get_top_selected_node_list().size() == 1 && !collision_reposition && _has_unlocked_selection()) {
if (_edit.mode == TRANSFORM_NONE || _edit.instant) {
if (_edit.mode == TRANSFORM_NONE) {
_compute_edit(_edit.mouse_pos);
@@ -6161,6 +6172,10 @@ void Node3DEditorViewport::begin_transform(TransformMode p_mode, bool instant) {
}
if (get_selected_count() > 0) {
if (!_has_unlocked_selection()) {
return;
}
_edit.children_original_globals.clear();
_edit.mode = p_mode;
@@ -8249,6 +8264,8 @@ void Node3DEditor::_menu_item_pressed(int p_option) {
undo_redo->add_do_method(this, "_refresh_menu_icons");
undo_redo->add_undo_method(this, "_refresh_menu_icons");
undo_redo->add_do_method(this, "update_transform_gizmo");
undo_redo->add_undo_method(this, "update_transform_gizmo");
undo_redo->commit_action();
} break;
case MENU_UNLOCK_SELECTED: {
@@ -8270,6 +8287,8 @@ void Node3DEditor::_menu_item_pressed(int p_option) {
undo_redo->add_do_method(this, "_refresh_menu_icons");
undo_redo->add_undo_method(this, "_refresh_menu_icons");
undo_redo->add_do_method(this, "update_transform_gizmo");
undo_redo->add_undo_method(this, "update_transform_gizmo");
undo_redo->commit_action();
} break;
case MENU_GROUP_SELECTED: {
editor/scene/3d/node_3d_editor_plugin.h
+1
View File
@@ -302,6 +302,7 @@ private:
Transform3D _get_camera_transform() const;
int get_selected_count() const;
bool _has_unlocked_selection() const;
void cancel_transform();
void _update_shrink();
editor/scene/scene_tree_editor.cpp
+13 -2
View File
@@ -45,6 +45,7 @@
#include "editor/editor_undo_redo_manager.h"
#include "editor/file_system/editor_file_system.h"
#include "editor/gui/filter_line_edit.h"
#include "editor/scene/3d/node_3d_editor_plugin.h"
#include "editor/scene/canvas_item_editor_plugin.h"
#include "editor/script/script_editor_plugin.h"
#include "editor/settings/editor_settings.h"
@@ -144,8 +145,18 @@ void SceneTreeEditor::_cell_button_pressed(Object *p_item, int p_column, int p_i
undo_redo->add_undo_method(n, "set_meta", "_edit_lock_", true);
undo_redo->add_do_method(this, "emit_signal", "node_changed");
undo_redo->add_undo_method(this, "emit_signal", "node_changed");
undo_redo->add_do_method(CanvasItemEditor::get_singleton(), "emit_signal", "item_lock_status_changed");
undo_redo->add_undo_method(CanvasItemEditor::get_singleton(), "emit_signal", "item_lock_status_changed");
if (Object::cast_to<CanvasItem>(n)) {
undo_redo->add_do_method(CanvasItemEditor::get_singleton(), "emit_signal", "item_lock_status_changed");
undo_redo->add_undo_method(CanvasItemEditor::get_singleton(), "emit_signal", "item_lock_status_changed");
} else if (Object::cast_to<Node3D>(n)) {
Node3DEditor *node_3d_editor = Node3DEditor::get_singleton();
undo_redo->add_do_method(node_3d_editor, "emit_signal", "item_lock_status_changed");
undo_redo->add_undo_method(node_3d_editor, "emit_signal", "item_lock_status_changed");
undo_redo->add_do_method(node_3d_editor, "_refresh_menu_icons");
undo_redo->add_undo_method(node_3d_editor, "_refresh_menu_icons");
undo_redo->add_do_method(node_3d_editor, "update_transform_gizmo");
undo_redo->add_undo_method(node_3d_editor, "update_transform_gizmo");
}
undo_redo->commit_action();
} else if (p_id == BUTTON_PIN) {
if (n->is_class("AnimationMixer")) {