[Bf-blender-cvs] [d61b9c3e7d9] greasepencil-object: GPencil: Fix opacity in Multiply Modifier

Antonio Vazquez noreply at git.blender.org
Thu Feb 27 11:01:06 CET 2020


Commit: d61b9c3e7d9bdbc519c1ce74a536ed6214e96601
Author: Antonio Vazquez
Date:   Thu Feb 27 11:00:57 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rBd61b9c3e7d9bdbc519c1ce74a536ed6214e96601

GPencil: Fix opacity in Multiply Modifier

The value was inverted.

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

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

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

diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c
index 433afbdf26e..cac41e1ac89 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c
@@ -67,6 +67,7 @@ static void initData(GpencilModifierData *md)
   mmd->duplications = 3;
   mmd->distance = 0.1f;
   mmd->split_angle = 1.0f;
+  mmd->fading_opacity = 1.0f;
 }
 
 static void copyData(const GpencilModifierData *md, GpencilModifierData *target)
@@ -200,8 +201,8 @@ static void duplicateStroke(bGPDstroke *gps,
                              (interpf(
                                  1.0f, 1 - fading_thickness, offset_factor - fading_center + 1));
       opacity_factor = (offset_factor > fading_center) ?
-                           (interpf(1 - fading_opacity, 1.0f, offset_factor - fading_center)) :
-                           (interpf(1.0f, 1 - fading_opacity, offset_factor - fading_center + 1));
+                           (interpf(fading_opacity, 1.0f, offset_factor - fading_center)) :
+                           (interpf(1.0f, fading_opacity, offset_factor - fading_center + 1));
     }
 
     for (int j = 0; j < new_gps->totpoints; j++) {



More information about the Bf-blender-cvs mailing list