[Bf-blender-cvs] [448241cf965] greasepencil-object: Fix Tint error when factor is 1

[Antonio Vazquez]

Commit: 448241cf96503db5a5221906ca3c0581af9563a4
Author: Antonio Vazquez
Date:   Thu Aug 10 11:42:24 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB448241cf96503db5a5221906ca3c0581af9563a4

Fix Tint error when factor is 1

When factor is 1, must override the alpha of the original color

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

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 8da8f9fa135..71df740419a 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -418,6 +418,12 @@ void BKE_gpencil_tint_modifier(int UNUSED(id), GpencilTintModifierData *mmd, Obj
 	interp_v3_v3v3(gps->palcolor->rgb, gps->palcolor->rgb, mmd->rgb, mmd->factor);
 	interp_v3_v3v3(gps->palcolor->fill, gps->palcolor->fill, mmd->rgb, mmd->factor);
 
+	/* if factor is 1, the alpha must be solid to get full tint */
+	if (mmd->factor == 1.0f) {
+		gps->palcolor->rgb[3] = 1.0f;
+		gps->palcolor->fill[3] = 1.0f;
+	}
+
 	CLAMP3(gps->palcolor->rgb, 0.0f, 1.0f);
 	CLAMP3(gps->palcolor->fill, 0.0f, 1.0f);
 }