Fix being able to select hidden transform gizmo

ryevdokimov · ryevdokimov · commit c94030e97dff · 2025-01-01T16:41:36.000-05:00
diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp
@@ -1875,7 +1875,7 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 					}
 
 					// Transform gizmo
-					if (_transform_gizmo_select(_edit.mouse_pos)) {
+					if (transform_gizmo_visible && _transform_gizmo_select(_edit.mouse_pos)) {
 						break;
 					}
 
@@ -2079,7 +2079,7 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 			}
 		}
 
-		if (spatial_editor->get_current_hover_gizmo().is_null() && !m->get_button_mask().has_flag(MouseButtonMask::LEFT) && _edit.gizmo.is_null()) {
+		if (transform_gizmo_visible && spatial_editor->get_current_hover_gizmo().is_null() && !m->get_button_mask().has_flag(MouseButtonMask::LEFT) && _edit.gizmo.is_null()) {
 			_transform_gizmo_select(_edit.mouse_pos, true);
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -1875,7 +1875,7 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {`
`1875`	`1875`	`}`
`1876`	`1876`
`1877`	`1877`	`// Transform gizmo`
`1878`		`- if (_transform_gizmo_select(_edit.mouse_pos)) {`
	`1878`	`+ if (transform_gizmo_visible && _transform_gizmo_select(_edit.mouse_pos)) {`
`1879`	`1879`	`break;`
`1880`	`1880`	`}`
`1881`	`1881`
`@@ -2079,7 +2079,7 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {`
`2079`	`2079`	`}`
`2080`	`2080`	`}`
`2081`	`2081`
`2082`		`- if (spatial_editor->get_current_hover_gizmo().is_null() && !m->get_button_mask().has_flag(MouseButtonMask::LEFT) && _edit.gizmo.is_null()) {`
	`2082`	`+ if (transform_gizmo_visible && spatial_editor->get_current_hover_gizmo().is_null() && !m->get_button_mask().has_flag(MouseButtonMask::LEFT) && _edit.gizmo.is_null()) {`
`2083`	`2083`	`_transform_gizmo_select(_edit.mouse_pos, true);`
`2084`	`2084`	`}`
`2085`	`2085`