[Bf-blender-cvs] [711563594a4] greasepencil-object: GPencil: Use Vertex Color in Hue/Saturation modifier

Antonio Vazquez noreply at git.blender.org
Tue Nov 5 15:39:00 CET 2019


Commit: 711563594a4d88e8c025c88eab818b674481d22b
Author: Antonio Vazquez
Date:   Tue Nov 5 15:38:45 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB711563594a4d88e8c025c88eab818b674481d22b

GPencil: Use Vertex Color in Hue/Saturation modifier

===================================================================

M	source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c

===================================================================

diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c
index cbe2d9a4c4f..11c8225a177 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c
@@ -107,6 +107,26 @@ static void deformStroke(GpencilModifierData *md,
     CLAMP3(hsv, 0.0f, 1.0f);
     hsv_to_rgb_v(hsv, gps->runtime.tmp_fill_rgba);
   }
+
+  /* Apply to mix color. */
+  /* Fill */
+  if (mmd->modify_color != GP_MODIFY_COLOR_STROKE) {
+    rgb_to_hsv_v(gps->mix_color_fill, hsv);
+    add_v3_v3(hsv, factor);
+    CLAMP3(hsv, 0.0f, 1.0f);
+    hsv_to_rgb_v(hsv, gps->mix_color_fill);
+  }
+
+  /* Stroke */
+  if (mmd->modify_color != GP_MODIFY_COLOR_FILL) {
+    for (int i = 0; i < gps->totpoints; i++) {
+      bGPDspoint *pt = &gps->points[i];
+      rgb_to_hsv_v(pt->mix_color, hsv);
+      add_v3_v3(hsv, factor);
+      CLAMP3(hsv, 0.0f, 1.0f);
+      hsv_to_rgb_v(hsv, pt->mix_color);
+    }
+  }
 }
 
 static void bakeModifier(Main *bmain, Depsgraph *depsgraph, GpencilModifierData *md, Object *ob)



More information about the Bf-blender-cvs mailing list