diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-09-12 00:27:17 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-12 00:27:48 +0300 |
| commit | ef32be25c1796da9957f3a146f89ff8035db0c07 (patch) | |
| tree | 875fa0e72fb2959d81487f7d1ebcbb686d4a94a0 /source/blender/editors/transform/transform_gizmo_3d.c | |
| parent | c35042401443842de8a81d23d397206150313ac4 (diff) | |
Fix scale-cage editmode pivot point
Diffstat (limited to 'source/blender/editors/transform/transform_gizmo_3d.c')
| -rw-r--r-- | source/blender/editors/transform/transform_gizmo_3d.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform_gizmo_3d.c b/source/blender/editors/transform/transform_gizmo_3d.c index f3509f62faa..6cfac524ce4 100644 --- a/source/blender/editors/transform/transform_gizmo_3d.c +++ b/source/blender/editors/transform/transform_gizmo_3d.c @@ -1805,6 +1805,9 @@ static void WIDGETGROUP_xform_cage_refresh(const bContext *C, wmGizmoGroup *gzgr mid_v3_v3v3(gz->matrix_offset[3], rv3d->tw_axis_max, rv3d->tw_axis_min); mul_m3_v3(rv3d->tw_axis_matrix, gz->matrix_offset[3]); + float matrix_offset_global[4][4]; + mul_m4_m4m4(matrix_offset_global, gz->matrix_space, gz->matrix_offset); + PropertyRNA *prop_center_override = NULL; float center[3]; float center_global[3]; @@ -1819,7 +1822,7 @@ static void WIDGETGROUP_xform_cage_refresh(const bContext *C, wmGizmoGroup *gzgr if (prop_center_override == NULL) { prop_center_override = RNA_struct_find_property(&mpop->ptr, "center_override"); } - mul_v3_m4v3(center_global, gz->matrix_offset, center); + mul_v3_m4v3(center_global, matrix_offset_global, center); RNA_property_float_set_array(&mpop->ptr, prop_center_override, center_global); i++; } |