archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'blender-v2.92-release'

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

15
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. */ /* Use a copy in case aspect was applied to the quad. */
float base_co_dst[3]; float base_co_dst[3];
copy_v3_v3(base_co_dst, quad_base[2]); 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); sub_v3_v3(quad_base[i], base_co_dst);
mul_v3_fl(quad_base[i], 2.0f); mul_v3_fl(quad_base[i], 2.0f);
add_v3_v3(quad_base[i], base_co_dst); add_v3_v3(quad_base[i], base_co_dst);
} }
fixed_aspect_dimension *= 2.0f;
} }
/* *** Secondary *** */ /* *** Secondary *** */
@@ -634,12 +635,20 @@ static bool calc_bbox(struct InteractivePlaceData *ipd, BoundBox *bounds)
} }
if (ipd->step[1].is_centered) { if (ipd->step[1].is_centered) {
for (int i = 0; i < ARRAY_SIZE(quad_base); i++) { float temp_delta[3];
sub_v3_v3(quad_base[i], delta_local); 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); 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);
}
}
if ((ipd->step_index == STEP_DEPTH) && if ((ipd->step_index == STEP_DEPTH) &&
(compare_v3v3(ipd->step[0].co_dst, ipd->step[1].co_dst, FLT_EPSILON) == false)) { (compare_v3v3(ipd->step[0].co_dst, ipd->step[1].co_dst, FLT_EPSILON) == false)) {