diff options
| author | Charlie Jolly <mistajolly@gmail.com> | 2018-08-09 14:42:02 +0300 |
|---|---|---|
| committer | Antonioya <blendergit@gmail.com> | 2018-08-09 14:43:21 +0300 |
| commit | 2e10c658f42a842404f16a1b03ff4844e41d538c (patch) | |
| tree | efde511079a2e4537477c1da3f5b202982bc4780 /source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c | |
| parent | f284821bf714cca98d86ede1e2a9713094d1d686 (diff) | |
GP: Add option to select color affected in modifiers
Now it's possible to define if the Tint, Hue and OPacity modifier affect the stroke color, fill color or both.
Diffstat (limited to 'source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c')
| -rw-r--r-- | source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c index 4c087577699..40ffe293d41 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c @@ -60,6 +60,7 @@ static void initData(GpencilModifierData *md) ARRAY_SET_ITEMS(gpmd->hsv, 1.0f, 1.0f, 1.0f); gpmd->layername[0] = '\0'; gpmd->flag |= GP_COLOR_CREATE_COLORS; + gpmd->modify_color = GP_MODIFY_COLOR_BOTH; } static void copyData(const GpencilModifierData *md, GpencilModifierData *target) @@ -86,15 +87,19 @@ static void deformStroke( copy_v3_v3(factor, mmd->hsv); add_v3_fl(factor, -1.0f); - rgb_to_hsv_v(gps->runtime.tmp_stroke_rgba, hsv); - add_v3_v3(hsv, factor); - CLAMP3(hsv, 0.0f, 1.0f); - hsv_to_rgb_v(hsv, gps->runtime.tmp_stroke_rgba); + if (mmd->modify_color != GP_MODIFY_COLOR_FILL) { + rgb_to_hsv_v(gps->runtime.tmp_stroke_rgba, hsv); + add_v3_v3(hsv, factor); + CLAMP3(hsv, 0.0f, 1.0f); + hsv_to_rgb_v(hsv, gps->runtime.tmp_stroke_rgba); + } - rgb_to_hsv_v(gps->runtime.tmp_fill_rgba, hsv); - add_v3_v3(hsv, factor); - CLAMP3(hsv, 0.0f, 1.0f); - hsv_to_rgb_v(hsv, gps->runtime.tmp_fill_rgba); + if (mmd->modify_color != GP_MODIFY_COLOR_STROKE) { + rgb_to_hsv_v(gps->runtime.tmp_fill_rgba, hsv); + add_v3_v3(hsv, factor); + CLAMP3(hsv, 0.0f, 1.0f); + hsv_to_rgb_v(hsv, gps->runtime.tmp_fill_rgba); + } } static void bakeModifier( |