griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.3-release'

Browse Source
This commit is contained in:
Jacques Lucke
2024-11-12 22:58:40 +01:00
parent 31ba9b798b 917f7e648c
commit 2618b0ac01
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/editors/space_view3d/view3d_gizmo_geometry_nodes.cc
View File

@@ -378,7 +378,14 @@ class DialGizmo : public NodeGizmos {
copy_m4_m4(gizmo_->matrix_basis, gizmo_transform.ptr());
WM_gizmo_set_flag(gizmo_, WM_GIZMO_DRAW_NO_SCALE, !screen_space);
copy_m4_m4(gizmo_->matrix_offset, math::from_scale<float4x4>(float3(radius)).ptr());
float transform_scale = 1.0f;
if (!screen_space) {
/* We can't scale the dial gizmo non-uniformly, so just take the average of the scale in each
* axis for now. */
transform_scale = math::average(math::to_scale(params.parent_transform));
}
copy_m4_m4(gizmo_->matrix_offset,
math::from_scale<float4x4>(float3(radius * transform_scale)).ptr());
return true;
}