[Bf-blender-cvs] [5225f432352] greasepencil-object: Change Opacify modifier again

Antonio Vazquez noreply at git.blender.org
Fri Aug 11 13:25:58 CEST 2017


Commit: 5225f432352624dfdd1ac69fafe62603788b801f
Author: Antonio Vazquez
Date:   Fri Aug 11 13:25:50 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB5225f432352624dfdd1ac69fafe62603788b801f

Change Opacify modifier again

The fill color only must be changed if was defined with an opacity factor.

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

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 cad3fd6dbe1..a60e4e913f1 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -472,6 +472,9 @@ void BKE_gpencil_opacity_modifier(int UNUSED(id), GpencilOpacityModifierData *mm
 	/* if factor is > 1, then force opacity */
 	if (mmd->factor > 1.0f) {
 		gps->palcolor->rgb[3] += mmd->factor - 1.0f;
+		if (gps->palcolor->fill[3] > 1e-5) {
+			gps->palcolor->fill[3] += mmd->factor - 1.0f;
+		}
 	}




More information about the Bf-blender-cvs mailing list