[Bf-blender-cvs] [b793e07d0c4] greasepencil-object: Change strengthin Tint modifier

[Antonio Vazquez]

Commit: b793e07d0c4ab75737b1d9eca6e5c86f6a3a86f2
Author: Antonio Vazquez
Date:   Fri Aug 11 15:39:57 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBb793e07d0c4ab75737b1d9eca6e5c86f6a3a86f2

Change strengthin Tint modifier

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

M       source/blender/blenkernel/intern/gpencil_modifier.c

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

diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c 
b/source/blender/blenkernel/intern/gpencil_modifier.c
index a60e4e913f1..ae1db303ed7 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -410,6 +410,8 @@ void BKE_gpencil_thick_modifier(int UNUSED(id), 
GpencilThickModifierData *mmd, O
 /* tint strokes */
 void BKE_gpencil_tint_modifier(int UNUSED(id), GpencilTintModifierData *mmd, 
Object *UNUSED(ob), bGPDlayer *gpl, bGPDstroke *gps)
 {
+       bGPDspoint *pt;
+
        if (!is_stroke_affected_by_modifier(mmd->layername, mmd->passindex, 1, 
gpl, gps,
                (bool)mmd->flag & GP_TINT_INVERSE_LAYER, (bool)mmd->flag & 
GP_TINT_INVERSE_PASS)) {
                return;
@@ -421,11 +423,23 @@ void BKE_gpencil_tint_modifier(int UNUSED(id), 
GpencilTintModifierData *mmd, Obj
        /* if factor is > 1, the alpha must be changed to get full tint */
        if (mmd->factor > 1.0f) {
                gps->palcolor->rgb[3] += mmd->factor - 1.0f;
-               gps->palcolor->fill[3] += mmd->factor - 1.0f;
+               if (gps->palcolor->fill[3] > 1e-5) {
+                       gps->palcolor->fill[3] += mmd->factor - 1.0f;
+               }
        }
 
        CLAMP4(gps->palcolor->rgb, 0.0f, 1.0f);
        CLAMP4(gps->palcolor->fill, 0.0f, 1.0f);
+       
+       /* if factor > 1.0, affect the strength of the stroke */
+       if (mmd->factor > 1.0f) {
+               for (int i = 0; i < gps->totpoints; ++i) {
+                       pt = &gps->points[i];
+                       pt->strength += mmd->factor - 1.0f;
+                       CLAMP(pt->strength, 0.0f, 1.0f);
+               }
+       }
+
 }
 
 /* color correction strokes */

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs