[Bf-blender-cvs] [1eadb4e8e1d] greasepencil-object: Fix Opacity modifier do not change fill opacity
Antonio Vazquez
noreply at git.blender.org
Fri Aug 11 10:24:26 CEST 2017
Commit: 1eadb4e8e1dac3ec9b16c1e23c7d489e7ecbce07
Author: Antonio Vazquez
Date: Fri Aug 11 10:14:06 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB1eadb4e8e1dac3ec9b16c1e23c7d489e7ecbce07
Fix Opacity modifier do not change fill opacity
The fill opacity cannot be set to 1
===================================================================
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 db3e738c596..cad3fd6dbe1 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -466,13 +466,12 @@ void BKE_gpencil_opacity_modifier(int UNUSED(id), GpencilOpacityModifierData *mm
return;
}
- gps->palcolor->rgb[3] = (gps->palcolor->rgb[3] * mmd->factor);
+ gps->palcolor->rgb[3] = gps->palcolor->rgb[3] * mmd->factor;
gps->palcolor->fill[3] = gps->palcolor->fill[3] * mmd->factor;
/* if factor is > 1, then force opacity */
if (mmd->factor > 1.0f) {
gps->palcolor->rgb[3] += mmd->factor - 1.0f;
- gps->palcolor->fill[3] += mmd->factor - 1.0f;
}
More information about the Bf-blender-cvs
mailing list