[Bf-blender-cvs] [6f7eecc47b7] greasepencil-object: Remove uses of BKE_gpencil_batch_cache_alldirty()

Antonio Vazquez noreply at git.blender.org
Mon Oct 23 15:58:49 CEST 2017


Commit: 6f7eecc47b7b471e5103f9486bb81fccc436f65e
Author: Antonio Vazquez
Date:   Mon Oct 23 15:58:24 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB6f7eecc47b7b471e5103f9486bb81fccc436f65e

Remove uses of BKE_gpencil_batch_cache_alldirty()

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

M	source/blender/editors/object/object_modifier.c
M	source/blender/modifiers/intern/MOD_gpencilarray.c
M	source/blender/modifiers/intern/MOD_gpencilblur.c
M	source/blender/modifiers/intern/MOD_gpencilcolor.c
M	source/blender/modifiers/intern/MOD_gpencildupli.c
M	source/blender/modifiers/intern/MOD_gpencillattice.c
M	source/blender/modifiers/intern/MOD_gpencilnoise.c
M	source/blender/modifiers/intern/MOD_gpencilopacity.c
M	source/blender/modifiers/intern/MOD_gpencilpixel.c
M	source/blender/modifiers/intern/MOD_gpencilsimplify.c
M	source/blender/modifiers/intern/MOD_gpencilsubdiv.c
M	source/blender/modifiers/intern/MOD_gpencilswirl.c
M	source/blender/modifiers/intern/MOD_gpencilthick.c
M	source/blender/modifiers/intern/MOD_gpenciltint.c
M	source/blender/modifiers/intern/MOD_gpencilwave.c

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

diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index b9ea4dd2d07..899b74114c6 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -174,6 +174,10 @@ ModifierData *ED_object_modifier_add(ReportList *reports, Main *bmain, Scene *sc
 		}
 	}
 
+	if (ob->type == OB_GPENCIL) {
+		BKE_gpencil_batch_cache_dirty(ob->gpd);
+	}
+
 	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	DEG_relations_tag_update(bmain);
 
diff --git a/source/blender/modifiers/intern/MOD_gpencilarray.c b/source/blender/modifiers/intern/MOD_gpencilarray.c
index 47071932f95..cb0a9dcc42f 100644
--- a/source/blender/modifiers/intern/MOD_gpencilarray.c
+++ b/source/blender/modifiers/intern/MOD_gpencilarray.c
@@ -72,8 +72,6 @@ static void initData(ModifierData *md)
 	/* fill random values */
 	BKE_gpencil_fill_random_array(gpmd->rnd, 20);
 	gpmd->rnd[0] = 1;
-
-	BKE_gpencil_batch_cache_alldirty();
 }
 
 static void copyData(ModifierData *md, ModifierData *target)
diff --git a/source/blender/modifiers/intern/MOD_gpencilblur.c b/source/blender/modifiers/intern/MOD_gpencilblur.c
index fd221bff9e9..93b4f4c5f8b 100644
--- a/source/blender/modifiers/intern/MOD_gpencilblur.c
+++ b/source/blender/modifiers/intern/MOD_gpencilblur.c
@@ -44,8 +44,6 @@ static void initData(ModifierData *md)
 {
 	GpencilBlurModifierData *gpmd = (GpencilBlurModifierData *)md;
 	ARRAY_SET_ITEMS(gpmd->radius, 1, 1);
-
-	BKE_gpencil_batch_cache_alldirty();
 }
 
 ModifierTypeInfo modifierType_GpencilBlur = {
diff --git a/source/blender/modifiers/intern/MOD_gpencilcolor.c b/source/blender/modifiers/intern/MOD_gpencilcolor.c
index e2d2b6333e6..b3d8f1d0a94 100644
--- a/source/blender/modifiers/intern/MOD_gpencilcolor.c
+++ b/source/blender/modifiers/intern/MOD_gpencilcolor.c
@@ -51,8 +51,6 @@ static void initData(ModifierData *md)
 	ARRAY_SET_ITEMS(gpmd->hsv, 1.0f, 1.0f, 1.0f);
 	gpmd->layername[0] = '\0';
 	gpmd->flag |= GP_COLOR_CREATE_COLORS;
-
-	BKE_gpencil_batch_cache_alldirty();
 }
 
 static void copyData(ModifierData *md, ModifierData *target)
diff --git a/source/blender/modifiers/intern/MOD_gpencildupli.c b/source/blender/modifiers/intern/MOD_gpencildupli.c
index 59f289e60d9..67b502ee39a 100644
--- a/source/blender/modifiers/intern/MOD_gpencildupli.c
+++ b/source/blender/modifiers/intern/MOD_gpencildupli.c
@@ -55,8 +55,6 @@ static void initData(ModifierData *md)
 	/* fill random values */
 	BKE_gpencil_fill_random_array(gpmd->rnd, 20);
 	gpmd->rnd[0] = 1;
-
-	BKE_gpencil_batch_cache_alldirty();
 }
 
 static void copyData(ModifierData *md, ModifierData *target)
diff --git a/source/blender/modifiers/intern/MOD_gpencillattice.c b/source/blender/modifiers/intern/MOD_gpencillattice.c
index 3c525e88433..c9135ffed91 100644
--- a/source/blender/modifiers/intern/MOD_gpencillattice.c
+++ b/source/blender/modifiers/intern/MOD_gpencillattice.c
@@ -59,8 +59,6 @@ static void initData(ModifierData *md)
 	gpmd->object = NULL;
 	gpmd->cache_data = NULL;
 	gpmd->strength = 1.0f;
-
-	BKE_gpencil_batch_cache_alldirty();
 }
 
 static void copyData(ModifierData *md, ModifierData *target)
diff --git a/source/blender/modifiers/intern/MOD_gpencilnoise.c b/source/blender/modifiers/intern/MOD_gpencilnoise.c
index 3dae04716ea..ad01d26370c 100644
--- a/source/blender/modifiers/intern/MOD_gpencilnoise.c
+++ b/source/blender/modifiers/intern/MOD_gpencilnoise.c
@@ -56,8 +56,6 @@ static void initData(ModifierData *md)
 	gpmd->gp_frame = -999999;
 	gpmd->vrand1 = 1.0;
 	gpmd->vrand2 = 1.0;
-
-	BKE_gpencil_batch_cache_alldirty();
 }
 
 static void copyData(ModifierData *md, ModifierData *target)
diff --git a/source/blender/modifiers/intern/MOD_gpencilopacity.c b/source/blender/modifiers/intern/MOD_gpencilopacity.c
index c3e3dfb2658..262d3501abf 100644
--- a/source/blender/modifiers/intern/MOD_gpencilopacity.c
+++ b/source/blender/modifiers/intern/MOD_gpencilopacity.c
@@ -50,8 +50,6 @@ static void initData(ModifierData *md)
 	gpmd->factor = 1.0f;
 	gpmd->layername[0] = '\0';
 	gpmd->vgname[0] = '\0';
-
-	BKE_gpencil_batch_cache_alldirty();
 }
 
 static void copyData(ModifierData *md, ModifierData *target)
diff --git a/source/blender/modifiers/intern/MOD_gpencilpixel.c b/source/blender/modifiers/intern/MOD_gpencilpixel.c
index 0dc41f22510..951706bf15b 100644
--- a/source/blender/modifiers/intern/MOD_gpencilpixel.c
+++ b/source/blender/modifiers/intern/MOD_gpencilpixel.c
@@ -46,8 +46,6 @@ static void initData(ModifierData *md)
 	ARRAY_SET_ITEMS(gpmd->size, 5, 5);
 	ARRAY_SET_ITEMS(gpmd->rgba, 0.0f, 0.0f, 0.0f, 0.9f);
 	gpmd->flag |= GP_PIXEL_USE_LINES;
-
-	BKE_gpencil_batch_cache_alldirty();
 }
 
 ModifierTypeInfo modifierType_GpencilPixel = {
diff --git a/source/blender/modifiers/intern/MOD_gpencilsimplify.c b/source/blender/modifiers/intern/MOD_gpencilsimplify.c
index 378bb2e2023..9184a72a505 100644
--- a/source/blender/modifiers/intern/MOD_gpencilsimplify.c
+++ b/source/blender/modifiers/intern/MOD_gpencilsimplify.c
@@ -46,8 +46,6 @@ static void initData(ModifierData *md)
 	gpmd->pass_index = 0;
 	gpmd->factor = 0.0f;
 	gpmd->layername[0] = '\0';
-
-	BKE_gpencil_batch_cache_alldirty();
 }
 
 static void copyData(ModifierData *md, ModifierData *target)
diff --git a/source/blender/modifiers/intern/MOD_gpencilsubdiv.c b/source/blender/modifiers/intern/MOD_gpencilsubdiv.c
index 6f2e10905e3..20f520b6032 100644
--- a/source/blender/modifiers/intern/MOD_gpencilsubdiv.c
+++ b/source/blender/modifiers/intern/MOD_gpencilsubdiv.c
@@ -47,8 +47,6 @@ static void initData(ModifierData *md)
 	gpmd->flag |= GP_SUBDIV_SIMPLE;
 	gpmd->level = 1;
 	gpmd->layername[0] = '\0';
-
-	BKE_gpencil_batch_cache_alldirty();
 }
 
 static void copyData(ModifierData *md, ModifierData *target)
diff --git a/source/blender/modifiers/intern/MOD_gpencilswirl.c b/source/blender/modifiers/intern/MOD_gpencilswirl.c
index e717283c5e9..a18e86fc589 100644
--- a/source/blender/modifiers/intern/MOD_gpencilswirl.c
+++ b/source/blender/modifiers/intern/MOD_gpencilswirl.c
@@ -47,8 +47,6 @@ static void initData(ModifierData *md)
 	ARRAY_SET_ITEMS(gpmd->center, 600, 600);
 	gpmd->angle = 1.57079f; // PI/2
 	gpmd->flag |= GP_SWIRL_USE_OB_LOC;
-
-	BKE_gpencil_batch_cache_alldirty();
 }
 
 ModifierTypeInfo modifierType_GpencilSwirl = {
diff --git a/source/blender/modifiers/intern/MOD_gpencilthick.c b/source/blender/modifiers/intern/MOD_gpencilthick.c
index dcfc2d51082..cb0e402e75f 100644
--- a/source/blender/modifiers/intern/MOD_gpencilthick.c
+++ b/source/blender/modifiers/intern/MOD_gpencilthick.c
@@ -53,8 +53,6 @@ static void initData(ModifierData *md)
 	if (gpmd->cur_thickness) {
 		curvemapping_initialize(gpmd->cur_thickness);
 	}
-
-	BKE_gpencil_batch_cache_alldirty();
 }
 
 static void freeData(ModifierData *md)
diff --git a/source/blender/modifiers/intern/MOD_gpenciltint.c b/source/blender/modifiers/intern/MOD_gpenciltint.c
index 1395890a35a..3ed7551c269 100644
--- a/source/blender/modifiers/intern/MOD_gpenciltint.c
+++ b/source/blender/modifiers/intern/MOD_gpenciltint.c
@@ -51,8 +51,6 @@ static void initData(ModifierData *md)
 	gpmd->factor = 0;
 	gpmd->layername[0] = '\0';
 	gpmd->flag |= GP_TINT_CREATE_COLORS;
-
-	BKE_gpencil_batch_cache_alldirty();
 }
 
 static void copyData(ModifierData *md, ModifierData *target)
diff --git a/source/blender/modifiers/intern/MOD_gpencilwave.c b/source/blender/modifiers/intern/MOD_gpencilwave.c
index 0cb170111fb..04a49e5d95f 100644
--- a/source/blender/modifiers/intern/MOD_gpencilwave.c
+++ b/source/blender/modifiers/intern/MOD_gpencilwave.c
@@ -47,8 +47,6 @@ static void initData(ModifierData *md)
 	gpmd->period = 20.0f;
 	gpmd->phase = 0.0f;
 	gpmd->orientation = 1;
-	
-	BKE_gpencil_batch_cache_alldirty();
 }
 
 ModifierTypeInfo modifierType_GpencilWave = {



More information about the Bf-blender-cvs mailing list