blender
/
blender
128
396
Fork 568
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Fix T102000: Curve Shrink Fatten doesn't work for zero radius 

Kind of intentional regression on rB2d1fe736fabd.

But the solution now is (theoretically) better than adding a hard coded
threshold.

For cases with zero radius, the new radius is now the offset of the
ratio projected onto the plane of the origin point.
This commit is contained in:
Germano Cavalcante 2022-10-22 19:31:57 -03:00
parent afec1cd333
commit b70bbfadfe
Notes: blender-bot 2023-02-13 14:12:03 +01:00 
Referenced by commit b7c5ce8c2d, Transform: limit zero radius Shrink/Fatten to only 1 curve point
Referenced by issue #102000, Spline radius doesn't work proerly
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/editors/transform/transform_mode_curveshrinkfatten.c
View File

@ -8,6 +8,7 @@
#include <stdlib.h>
#include "BLI_math.h"
#include "BLI_math_bits.h"
#include "BLI_string.h"
#include "BKE_context.h"
@ -62,7 +63,14 @@ static void applyCurveShrinkFatten(TransInfo *t, const int UNUSED(mval[2]))
}
if (td->val) {
*td->val = td->ival * ratio;
if (td->ival == 0.0f && ratio > 1.0f) {
/* Allow Shrink/Fatten for zero radius. */
*td->val = (ratio - 1.0f) * uint_as_float(POINTER_AS_UINT(t->custom.mode.data));
}
else {
*td->val = td->ival * ratio;
}
/* apply PET */
*td->val = interpf(*td->val, td->ival, td->factor);
CLAMP_MIN(*td->val, 0.0f);
@ -92,6 +100,13 @@ void initCurveShrinkFatten(TransInfo *t)
t->num.unit_type[0] = B_UNIT_NONE;
t->flag |= T_NO_CONSTRAINT;
if ((t->spacetype == SPACE_VIEW3D) && (t->region->regiontype == RGN_TYPE_WINDOW)) {
/* Save a factor to multiply the ratio and use in zero radius cases. */
RegionView3D *rv3d = t->region->regiondata;
float scale_factor = rv3d->pixsize * t->mouse.factor * t->zfac;
t->custom.mode.data = POINTER_FROM_UINT(float_as_uint(scale_factor));
}
}
/** \} */