[Bf-blender-cvs] [bb6dedfc84d] greasepencil-object: GPencil: Remove double curve initialization

Antonio Vazquez noreply at git.blender.org
Thu Mar 5 19:31:30 CET 2020


Commit: bb6dedfc84d888113bec6b4b3ea8097d679936be
Author: Antonio Vazquez
Date:   Thu Mar 5 19:31:09 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rBbb6dedfc84d888113bec6b4b3ea8097d679936be

GPencil: Remove double curve initialization

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

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

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

diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
index 77e62fd4285..2481bf024c6 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
@@ -65,8 +65,8 @@ static void initData(GpencilModifierData *md)
   gpmd->curve_intensity = BKE_curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
   if (gpmd->curve_intensity) {
     CurveMapping *curve = gpmd->curve_intensity;
-    BKE_curvemapping_initialize(curve);
     BKE_curvemap_reset(curve->cm, &curve->clipr, CURVE_PRESET_BELL, CURVEMAP_SLOPE_POSITIVE);
+    BKE_curvemapping_initialize(curve);
   }
 }
 
@@ -140,9 +140,6 @@ static void deformStroke(GpencilModifierData *md,
   seed += BLI_hash_string(ob->id.name + 2);
   seed += BLI_hash_string(md->name);
 
-  /* Initialize curve */
-  BKE_curvemapping_initialize(mmd->curve_intensity);
-
   if (mmd->flag & GP_NOISE_USE_RANDOM) {
     seed += ((int)DEG_get_ctime(depsgraph)) / mmd->step;
   }



More information about the Bf-blender-cvs mailing list