diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2020-07-28 10:14:47 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2020-07-28 10:14:47 +0300 |
| commit | c73809fbd1eecf6ff6ac5b15a17398f2ddcf4e87 (patch) | |
| tree | 380dcb9051b32888ef19885adcbe2c653422cea4 /source/blender/gpencil_modifiers | |
| parent | 68bebaf28f7f5d7d5030ae559b2e24859a6cc862 (diff) | |
| parent | 289aac723a178724ca64d39eb2daac14344f7316 (diff) | |
Merge branch 'master' into greasepencil-edit-curve
Diffstat (limited to 'source/blender/gpencil_modifiers')
| -rw-r--r-- | source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c index 09131b7d673..00fc4035ada 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c @@ -106,19 +106,23 @@ static void deformStroke(GpencilModifierData *md, bGPDspoint *pt = &gps->points[i]; MDeformVert *dvert = gps->dvert != NULL ? &gps->dvert[i] : NULL; - /* verify vertex group */ + /* Verify vertex group. */ const float weight = get_modifier_point_weight( dvert, (mmd->flag & GP_OFFSET_INVERT_VGROUP) != 0, def_nr); if (weight < 0.0f) { continue; } - /* calculate matrix */ + /* Calculate matrix. */ mul_v3_v3fl(loc, mmd->loc, weight); mul_v3_v3fl(rot, mmd->rot, weight); mul_v3_v3fl(scale, mmd->scale, weight); add_v3_fl(scale, 1.0); loc_eul_size_to_mat4(mat, loc, rot, scale); + /* Apply scale to thickness. */ + float unit_scale = (scale[0] + scale[1] + scale[2]) / 3.0f; + pt->pressure *= unit_scale; + mul_m4_v3(mat, &pt->x); } /* Calc geometry data. */ |