From d844271aef2d4bfbe0177918ee6c993d6ed9e1c3 Mon Sep 17 00:00:00 2001 From: Antonioya Date: Tue, 15 Jan 2019 20:24:07 +0100 Subject: GP: Use weight in noise modifier for all types The weight was used only for position. --- source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'source/blender/gpencil_modifiers') diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c index 722cf861fb1..7a9a3efbd95 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c @@ -219,10 +219,10 @@ static void deformStroke( /* apply randomness to thickness */ if (mmd->flag & GP_NOISE_MOD_THICKNESS) { if (vdir > 0.5f) { - pt1->pressure -= pt1->pressure * vran * mmd->factor; + pt1->pressure -= pt1->pressure * vran * mmd->factor * weight; } else { - pt1->pressure += pt1->pressure * vran * mmd->factor; + pt1->pressure += pt1->pressure * vran * mmd->factor * weight; } CLAMP_MIN(pt1->pressure, GPENCIL_STRENGTH_MIN); } @@ -230,20 +230,20 @@ static void deformStroke( /* apply randomness to color strength */ if (mmd->flag & GP_NOISE_MOD_STRENGTH) { if (vdir > 0.5f) { - pt1->strength -= pt1->strength * vran * mmd->factor; + pt1->strength -= pt1->strength * vran * mmd->factor * weight; } else { - pt1->strength += pt1->strength * vran * mmd->factor; + pt1->strength += pt1->strength * vran * mmd->factor * weight; } CLAMP_MIN(pt1->strength, GPENCIL_STRENGTH_MIN); } /* apply randomness to uv rotation */ if (mmd->flag & GP_NOISE_MOD_UV) { if (vdir > 0.5f) { - pt1->uv_rot -= pt1->uv_rot * vran * mmd->factor; + pt1->uv_rot -= pt1->uv_rot * vran * mmd->factor * weight; } else { - pt1->uv_rot += pt1->uv_rot * vran * mmd->factor; + pt1->uv_rot += pt1->uv_rot * vran * mmd->factor * weight; } CLAMP(pt1->uv_rot, -M_PI_2, M_PI_2); } -- cgit v1.2.3