Fix T86347: Add Primitive Tool fails for 1x1x1 scale

The Tool stores desired dimensions as `scale` and thus had to half the
scale again in `make_prim_init()` because by default all primitives are
created at a size of 2 in blender.

This worked, but:
- [1] it logged something like size=2, scale=2,2,2 for a 2x2x2 cube
[which does not sound right, it should be size=2 scale=1,1,1]
- [2] it had to make an exception for the case scale is exactly 1x1x1
[this happens when the property is not set specifically, e.g. adding
primitives from the menu]
-- this exception led to double sized primitives being created when the
tool asked for exact dimensions of 1x1x1

Now - instead of compensating in `make_prim_init()` - do this earlier in
the tool itself, see `view3d_interactive_add_modal`, this fixes the bug
and now also correctly logs size=2 scale 0.5,0.5,0.5 for a 1x1x1 cube.

Maniphest Tasks: T86347

Differential Revision: https://developer.blender.org/D10632
This commit is contained in:
Philipp Oeser 2021-03-07 13:05:34 +01:00
parent 91825ebfe2
commit e20b31504a
Notes: blender-bot 2023-02-14 06:00:45 +01:00
Referenced by issue #86347, Add Cube 1m unit size bugs out to 2m
2 changed files with 4 additions and 5 deletions

View File

@ -75,11 +75,8 @@ static Object *make_prim_init(bContext *C,
ED_object_new_primitive_matrix(C, obedit, loc, rot, r_creation_data->mat);
if (scale && !equals_v3v3(scale, (const float[3]){1.0f, 1.0f, 1.0f})) {
float scale_half[3];
copy_v3_v3(scale_half, scale);
mul_v3_fl(scale_half, 0.5f);
rescale_m4(r_creation_data->mat, scale_half);
if (scale) {
rescale_m4(r_creation_data->mat, scale);
}
return obedit;

View File

@ -1438,6 +1438,8 @@ static int view3d_interactive_add_modal(bContext *C, wmOperator *op, const wmEve
const int cube_verts[3] = {3, 1, 4};
for (int i = 0; i < 3; i++) {
scale[i] = len_v3v3(bounds.vec[0], bounds.vec[cube_verts[i]]);
/* Primitives have size 2 by default, compensate for this here. */
scale[i] /= 2.0f;
}
wmOperatorType *ot = NULL;