Merge pull request #100813 from ryevdokimov/prevent-selecting-hidden-transform-gizmo

Repiteo · Repiteo · commit a43e6e68cc41 · 2025-08-15T12:58:47.000-05:00
Fix being able to grab hidden transform gizmo handles
diff --git a/editor/scene/3d/node_3d_editor_plugin.cpp b/editor/scene/3d/node_3d_editor_plugin.cpp
@@ -1935,7 +1935,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;
 					}
 
@@ -2203,7 +2203,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
`@@ -1935,7 +1935,7 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {`
`1935`	`1935`	`}`
`1936`	`1936`
`1937`	`1937`	`// Transform gizmo`
`1938`		`- if (_transform_gizmo_select(_edit.mouse_pos)) {`
	`1938`	`+ if (transform_gizmo_visible && _transform_gizmo_select(_edit.mouse_pos)) {`
`1939`	`1939`	`break;`
`1940`	`1940`	`}`
`1941`	`1941`
`@@ -2203,7 +2203,7 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {`
`2203`	`2203`	`}`
`2204`	`2204`	`}`
`2205`	`2205`
`2206`		`- if (spatial_editor->get_current_hover_gizmo().is_null() && !m->get_button_mask().has_flag(MouseButtonMask::LEFT) && _edit.gizmo.is_null()) {`
	`2206`	`+ if (transform_gizmo_visible && spatial_editor->get_current_hover_gizmo().is_null() && !m->get_button_mask().has_flag(MouseButtonMask::LEFT) && _edit.gizmo.is_null()) {`
`2207`	`2207`	`_transform_gizmo_select(_edit.mouse_pos, true);`
`2208`	`2208`	`}`
`2209`	`2209`