blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Merge branch 'blender-v2.92-release'

This commit is contained in:
Campbell Barton 2021-01-19 13:36:53 +11:00
parent 2fa7e81d9c d31dd1da80
commit 94e9d3ca3e
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/editors/space_view3d/view3d_placement.c
View File

@ -610,11 +610,12 @@ static bool calc_bbox(struct InteractivePlaceData *ipd, BoundBox *bounds)
/* Use a copy in case aspect was applied to the quad. */
float base_co_dst[3];
copy_v3_v3(base_co_dst, quad_base[2]);
for (int i = 0; i < 4; i++) {
for (int i = 0; i < ARRAY_SIZE(quad_base); i++) {
sub_v3_v3(quad_base[i], base_co_dst);
mul_v3_fl(quad_base[i], 2.0f);
add_v3_v3(quad_base[i], base_co_dst);
}
fixed_aspect_dimension *= 2.0f;
}
/* *** Secondary *** */
@ -634,10 +635,18 @@ static bool calc_bbox(struct InteractivePlaceData *ipd, BoundBox *bounds)
}
if (ipd->step[1].is_centered) {
for (int i = 0; i < ARRAY_SIZE(quad_base); i++) {
sub_v3_v3(quad_base[i], delta_local);
float temp_delta[3];
if (ipd->step[1].is_fixed_aspect) {
mul_v3_v3fl(temp_delta, delta_local, 0.5f);
}
else {
copy_v3_v3(temp_delta, delta_local);
mul_v3_fl(delta_local, 2.0f);
}
for (int i = 0; i < ARRAY_SIZE(quad_base); i++) {
sub_v3_v3(quad_base[i], temp_delta);
}
mul_v3_fl(delta_local, 2.0f);
}
if ((ipd->step_index == STEP_DEPTH) &&