blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

GPencil: Fix envelope modifier deform mode thickness 

The thickness in the deform mode was just correct if the radius when
drawing a stroke was set to 20. Now all factors that influence the
stroke thickness are considered in deform mode.

Differential Revision: https://developer.blender.org/D14691
This commit is contained in:
Henrik Dick 2022-05-02 22:13:38 +02:00
parent 5188c14718
commit 62ef1c08af
Notes: blender-bot 2023-02-14 08:49:53 +01:00 
Referenced by issue #97818, Any addon using EVT_TWEAK_L and equivalents break.
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/gpencil_modifiers/intern/MOD_gpencilenvelope.c
View File

@ -152,8 +152,12 @@ static float calc_radius_limit(
return radius_limit;
}
static void apply_stroke_envelope(
bGPDstroke *gps, int spread, const int def_nr, const bool invert_vg, const float thickness)
static void apply_stroke_envelope(bGPDstroke *gps,
int spread,
const int def_nr,
const bool invert_vg,
const float thickness,
const float pixfactor)
{
const bool is_cyclic = (gps->flag & GP_STROKE_CYCLIC) != 0;
if (is_cyclic) {
@ -282,9 +286,7 @@ static void apply_stroke_envelope(
}
float fac = use_dist * weight;
/* The 50 is an internal constant for the default pixel size. The result can be messed up if
* #bGPdata.pixfactor is not default, but I think modifiers shouldn't access that. */
point->pressure += fac * 50.0f * GP_DEFAULT_PIX_FACTOR;
point->pressure += fac * pixfactor;
interp_v3_v3v3(&point->x, &point->x, new_center, fac / len_v3v3(closest, closest2));
}
@ -326,8 +328,14 @@ static void deformStroke(GpencilModifierData *md,
return;
}
apply_stroke_envelope(
gps, mmd->spread, def_nr, (mmd->flag & GP_ENVELOPE_INVERT_VGROUP) != 0, mmd->thickness);
bGPdata *gpd = (bGPdata *)ob->data;
const float pixfactor = 1000.0f / ((gps->thickness + gpl->line_change) * gpd->pixfactor);
apply_stroke_envelope(gps,
mmd->spread,
def_nr,
(mmd->flag & GP_ENVELOPE_INVERT_VGROUP) != 0,
mmd->thickness,
pixfactor);
}
static void add_stroke(Object *ob,