Skip to content

Fix 3D transform gizmo visibility after node lock/unlock #119176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Repiteo merged 1 commit into from
Jun 18, 2026
+35 −4
Merged

Fix 3D transform gizmo visibility after node lock/unlock #119176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions editor/scene/3d/node_3d_editor_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -2732,7 +2743,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;
Expand Down Expand Up @@ -3002,7 +3013,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);
Expand Down Expand Up @@ -6109,6 +6120,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;
Expand Down Expand Up @@ -8196,6 +8211,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: {
Expand All @@ -8217,6 +8234,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: {
Expand Down
1 change: 1 addition & 0 deletions editor/scene/3d/node_3d_editor_plugin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@ class Node3DEditorViewport : public Control {

Transform3D _get_camera_transform() const;
int get_selected_count() const;
bool _has_unlocked_selection() const;
void cancel_transform();
void _update_shrink();

Expand Down
15 changes: 13 additions & 2 deletions editor/scene/scene_tree_editor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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")) {
Expand Down
Loading