[Bf-blender-cvs] [9d4408f7a93] greasepencil-object: GPencil: Add Object name to Array and Noise seed generation

[Antonio Vazquez]

Commit: 9d4408f7a93942675fd3b6d09c645965626ef0bd
Author: Antonio Vazquez
Date:   Thu Mar 5 18:04:51 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB9d4408f7a93942675fd3b6d09c645965626ef0bd

GPencil: Add Object name to Array and Noise  seed generation

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

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

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

diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c
index cab42ed4b36..b2995ea4e76 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c
@@ -151,6 +151,7 @@ static void generate_geometry(GpencilModifierData *md,
 
   int seed = mmd->seed;
   /* Make sure different modifiers get different seeds. */
+  seed += BLI_hash_string(ob->id.name + 2);
   seed += BLI_hash_string(md->name);
 
   LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd->layers) {
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
index ab39cbce709..e240883fd19 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
@@ -132,12 +132,11 @@ static void deformStroke(GpencilModifierData *md,
   }
 
   int seed = mmd->seed;
-  /* TODO Find a better seed for stroke. Ideally their position in the strokelist. */
   int stroke_seed = gps->totpoints;
   seed += stroke_seed;
 
-  /* FIXME Seed is the same for all modifier currently.
-   * This is a workaround to make sure different modifiers get different seeds. */
+  /* Make sure different modifiers get different seeds. */
+  seed += BLI_hash_string(ob->id.name + 2);
   seed += BLI_hash_string(md->name);
 
   if (mmd->flag & GP_NOISE_USE_RANDOM) {