18 files changed, 41 insertions, 41 deletions

diff --git a/source/blender/blenkernel/BKE_curve.h b/source/blender/blenkernel/BKE_curve.h
index a3440097688..ff2b1a78a6f 100644
--- a/source/blender/blenkernel/BKE_curve.h
+++ b/source/blender/blenkernel/BKE_curve.h
@@ -231,7 +231,7 @@ enum {
 	BKE_CURVE_BATCH_DIRTY_ALL = 0,
 	BKE_CURVE_BATCH_DIRTY_SELECT,
 };
-void BKE_curve_batch_cache_dirty(struct Curve *cu, int mode);
+void BKE_curve_batch_cache_dirty_tag(struct Curve *cu, int mode);
 void BKE_curve_batch_cache_free(struct Curve *cu);
 
 /* curve_decimate.c */
diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h
index b7bef9bbf4e..19535f23cf2 100644
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@ -68,7 +68,7 @@ bool BKE_gpencil_free_frame_runtime_data(struct bGPDframe *derived_gpf);
 void BKE_gpencil_free_derived_frames(struct bGPdata *gpd);
 void BKE_gpencil_free(struct bGPdata *gpd, bool free_all);
 
-void BKE_gpencil_batch_cache_dirty(struct bGPdata *gpd);
+void BKE_gpencil_batch_cache_dirty_tag(struct bGPdata *gpd);
 void BKE_gpencil_batch_cache_free(struct bGPdata *gpd);
 
 void BKE_gpencil_stroke_sync_selection(struct bGPDstroke *gps);
diff --git a/source/blender/blenkernel/BKE_lattice.h b/source/blender/blenkernel/BKE_lattice.h
index 67e6a32edfd..e98839e3dbc 100644
--- a/source/blender/blenkernel/BKE_lattice.h
+++ b/source/blender/blenkernel/BKE_lattice.h
@@ -111,7 +111,7 @@ enum {
 	BKE_LATTICE_BATCH_DIRTY_ALL = 0,
 	BKE_LATTICE_BATCH_DIRTY_SELECT,
 };
-void BKE_lattice_batch_cache_dirty(struct Lattice *lt, int mode);
+void BKE_lattice_batch_cache_dirty_tag(struct Lattice *lt, int mode);
 void BKE_lattice_batch_cache_free(struct Lattice *lt);
 
 #endif  /* __BKE_LATTICE_H__ */
diff --git a/source/blender/blenkernel/BKE_mball.h b/source/blender/blenkernel/BKE_mball.h
index 74ef9d9dbc0..e6874cd064b 100644
--- a/source/blender/blenkernel/BKE_mball.h
+++ b/source/blender/blenkernel/BKE_mball.h
@@ -81,7 +81,7 @@ struct Depsgraph;
 enum {
 	BKE_MBALL_BATCH_DIRTY_ALL = 0,
 };
-void BKE_mball_batch_cache_dirty(struct MetaBall *mb, int mode);
+void BKE_mball_batch_cache_dirty_tag(struct MetaBall *mb, int mode);
 void BKE_mball_batch_cache_free(struct MetaBall *mb);
 
 #endif
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h
index 8a1a27b4999..0d7c4c6f597 100644
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@ -513,7 +513,7 @@ enum {
 	BKE_MESH_BATCH_DIRTY_SHADING,
 	BKE_MESH_BATCH_DIRTY_SCULPT_COORDS,
 };
-void BKE_mesh_batch_cache_dirty(struct Mesh *me, int mode);
+void BKE_mesh_batch_cache_dirty_tag(struct Mesh *me, int mode);
 void BKE_mesh_batch_cache_free(struct Mesh *me);
 
 
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h
index 90df5a5441a..81182a89f3e 100644
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@ -308,7 +308,7 @@ struct MovieClip *BKE_object_movieclip_get(struct Scene *scene, struct Object *o
 
 void BKE_object_runtime_reset(struct Object *object);
 
-void BKE_object_batch_cache_dirty(struct Object *ob);
+void BKE_object_batch_cache_dirty_tag(struct Object *ob);
 
 /* this function returns a superset of the scenes selection based on relationships */
 
diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h
index 3486027e628..3279839f8b5 100644
--- a/source/blender/blenkernel/BKE_particle.h
+++ b/source/blender/blenkernel/BKE_particle.h
@@ -474,5 +474,5 @@ void BKE_particle_system_eval_init(struct Depsgraph *depsgraph,
 enum {
 	BKE_PARTICLE_BATCH_DIRTY_ALL = 0,
 };
-void BKE_particle_batch_cache_dirty(struct ParticleSystem *psys, int mode);
+void BKE_particle_batch_cache_dirty_tag(struct ParticleSystem *psys, int mode);
 void BKE_particle_batch_cache_free(struct ParticleSystem *psys);
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index 0d6aa0e2630..a9e86087f42 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -5368,13 +5368,13 @@ void BKE_curve_eval_geometry(Depsgraph *depsgraph,
 }
 
 /* Draw Engine */
-void (*BKE_curve_batch_cache_dirty_cb)(Curve *cu, int mode) = NULL;
+void (*BKE_curve_batch_cache_dirty_tag_cb)(Curve *cu, int mode) = NULL;
 void (*BKE_curve_batch_cache_free_cb)(Curve *cu) = NULL;
 
-void BKE_curve_batch_cache_dirty(Curve *cu, int mode)
+void BKE_curve_batch_cache_dirty_tag(Curve *cu, int mode)
 {
 	if (cu->batch_cache) {
-		BKE_curve_batch_cache_dirty_cb(cu, mode);
+		BKE_curve_batch_cache_dirty_tag_cb(cu, mode);
 	}
 }
 void BKE_curve_batch_cache_free(Curve *cu)
diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c
index ddf9840a32e..78a287919d0 100644
--- a/source/blender/blenkernel/intern/deform.c
+++ b/source/blender/blenkernel/intern/deform.c
@@ -75,7 +75,7 @@ bDeformGroup *BKE_defgroup_new(Object *ob, const char *name)
 	defgroup_unique_name(defgroup, ob);
 
 	if (ob->type != OB_GPENCIL) {
-		BKE_mesh_batch_cache_dirty(ob->data, BKE_MESH_BATCH_DIRTY_ALL);
+		BKE_mesh_batch_cache_dirty_tag(ob->data, BKE_MESH_BATCH_DIRTY_ALL);
 	}
 
 	return defgroup;
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index fdb1123e1c7..57494397f40 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -71,14 +71,14 @@
 /* ************************************************** */
 /* Draw Engine */
 
-void(*BKE_gpencil_batch_cache_dirty_cb)(bGPdata *gpd) = NULL;
+void(*BKE_gpencil_batch_cache_dirty_tag_cb)(bGPdata *gpd) = NULL;
 void(*BKE_gpencil_batch_cache_free_cb)(bGPdata *gpd) = NULL;
 
-void BKE_gpencil_batch_cache_dirty(bGPdata *gpd)
+void BKE_gpencil_batch_cache_dirty_tag(bGPdata *gpd)
 {
 	if (gpd) {
 		DEG_id_tag_update(&gpd->id, OB_RECALC_DATA);
-		BKE_gpencil_batch_cache_dirty_cb(gpd);
+		BKE_gpencil_batch_cache_dirty_tag_cb(gpd);
 	}
 }
 
diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c
index ca555a46da5..05502ad9e9e 100644
--- a/source/blender/blenkernel/intern/lattice.c
+++ b/source/blender/blenkernel/intern/lattice.c
@@ -1254,13 +1254,13 @@ void BKE_lattice_eval_geometry(struct Depsgraph *UNUSED(depsgraph),
 }
 
 /* Draw Engine */
-void (*BKE_lattice_batch_cache_dirty_cb)(Lattice *lt, int mode) = NULL;
+void (*BKE_lattice_batch_cache_dirty_tag_cb)(Lattice *lt, int mode) = NULL;
 void (*BKE_lattice_batch_cache_free_cb)(Lattice *lt) = NULL;
 
-void BKE_lattice_batch_cache_dirty(Lattice *lt, int mode)
+void BKE_lattice_batch_cache_dirty_tag(Lattice *lt, int mode)
 {
 	if (lt->batch_cache) {
-		BKE_lattice_batch_cache_dirty_cb(lt, mode);
+		BKE_lattice_batch_cache_dirty_tag_cb(lt, mode);
 	}
 }
 void BKE_lattice_batch_cache_free(Lattice *lt)
diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c
index 43b7eba2810..bc2d7ed79d5 100644
--- a/source/blender/blenkernel/intern/mball.c
+++ b/source/blender/blenkernel/intern/mball.c
@@ -565,13 +565,13 @@ void BKE_mball_select_swap(struct MetaBall *mb)
 
 /* Draw Engine */
 
-void (*BKE_mball_batch_cache_dirty_cb)(MetaBall *mb, int mode) = NULL;
+void (*BKE_mball_batch_cache_dirty_tag_cb)(MetaBall *mb, int mode) = NULL;
 void (*BKE_mball_batch_cache_free_cb)(MetaBall *mb) = NULL;
 
-void BKE_mball_batch_cache_dirty(MetaBall *mb, int mode)
+void BKE_mball_batch_cache_dirty_tag(MetaBall *mb, int mode)
 {
 	if (mb->batch_cache) {
-		BKE_mball_batch_cache_dirty_cb(mb, mode);
+		BKE_mball_batch_cache_dirty_tag_cb(mb, mode);
 	}
 }
 void BKE_mball_batch_cache_free(MetaBall *mb)
diff --git a/source/blender/blenkernel/intern/mesh_runtime.c b/source/blender/blenkernel/intern/mesh_runtime.c
index a3fc422ade7..60699589a77 100644
--- a/source/blender/blenkernel/intern/mesh_runtime.c
+++ b/source/blender/blenkernel/intern/mesh_runtime.c
@@ -205,13 +205,13 @@ void BKE_mesh_runtime_clear_geometry(Mesh *mesh)
  * \{ */
 
 /* Draw Engine */
-void (*BKE_mesh_batch_cache_dirty_cb)(Mesh *me, int mode) = NULL;
+void (*BKE_mesh_batch_cache_dirty_tag_cb)(Mesh *me, int mode) = NULL;
 void (*BKE_mesh_batch_cache_free_cb)(Mesh *me) = NULL;
 
-void BKE_mesh_batch_cache_dirty(Mesh *me, int mode)
+void BKE_mesh_batch_cache_dirty_tag(Mesh *me, int mode)
 {
 	if (me->runtime.batch_cache) {
-		BKE_mesh_batch_cache_dirty_cb(me, mode);
+		BKE_mesh_batch_cache_dirty_tag_cb(me, mode);
 	}
 }
 void BKE_mesh_batch_cache_free(Mesh *me)
diff --git a/source/blender/blenkernel/intern/object_deform.c b/source/blender/blenkernel/intern/object_deform.c
index a6b0e57e55c..b8273703a94 100644
--- a/source/blender/blenkernel/intern/object_deform.c
+++ b/source/blender/blenkernel/intern/object_deform.c
@@ -412,7 +412,7 @@ void BKE_object_defgroup_remove(Object *ob, bDeformGroup *defgroup)
 		else
 			object_defgroup_remove_object_mode(ob, defgroup);
 
-		BKE_mesh_batch_cache_dirty(ob->data, BKE_MESH_BATCH_DIRTY_ALL);
+		BKE_mesh_batch_cache_dirty_tag(ob->data, BKE_MESH_BATCH_DIRTY_ALL);
 	}
 }
 
diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c
index 52e3d4a0803..54d21c261fc 100644
--- a/source/blender/blenkernel/intern/object_update.c
+++ b/source/blender/blenkernel/intern/object_update.c
@@ -302,25 +302,25 @@ void BKE_object_eval_uber_transform(Depsgraph *depsgraph, Object *object)
 	BKE_object_eval_proxy_copy(depsgraph, object);
 }
 
-void BKE_object_batch_cache_dirty(Object *ob)
+void BKE_object_batch_cache_dirty_tag(Object *ob)
 {
 	switch (ob->type) {
 		case OB_MESH:
-			BKE_mesh_batch_cache_dirty(ob->data, BKE_MESH_BATCH_DIRTY_ALL);
+			BKE_mesh_batch_cache_dirty_tag(ob->data, BKE_MESH_BATCH_DIRTY_ALL);
 			break;
 		case OB_LATTICE:
-			BKE_lattice_batch_cache_dirty(ob->data, BKE_LATTICE_BATCH_DIRTY_ALL);
+			BKE_lattice_batch_cache_dirty_tag(ob->data, BKE_LATTICE_BATCH_DIRTY_ALL);
 			break;
 		case OB_CURVE:
 		case OB_FONT:
 		case OB_SURF:
-			BKE_curve_batch_cache_dirty(ob->data, BKE_CURVE_BATCH_DIRTY_ALL);
+			BKE_curve_batch_cache_dirty_tag(ob->data, BKE_CURVE_BATCH_DIRTY_ALL);
 			break;
 		case OB_MBALL:
-			BKE_mball_batch_cache_dirty(ob->data, BKE_MBALL_BATCH_DIRTY_ALL);
+			BKE_mball_batch_cache_dirty_tag(ob->data, BKE_MBALL_BATCH_DIRTY_ALL);
 			break;
 		case OB_GPENCIL:
-			BKE_gpencil_batch_cache_dirty(ob->data);
+			BKE_gpencil_batch_cache_dirty_tag(ob->data);
 			break;
 	}
 }
@@ -332,7 +332,7 @@ void BKE_object_eval_uber_data(Depsgraph *depsgraph,
 	DEG_debug_print_eval(depsgraph, __func__, ob->id.name, ob);
 	BLI_assert(ob->type != OB_ARMATURE);
 	BKE_object_handle_data_update(depsgraph, scene, ob);
-	BKE_object_batch_cache_dirty(ob);
+	BKE_object_batch_cache_dirty_tag(ob);
 }
 
 void BKE_object_eval_cloth(Depsgraph *depsgraph,
@@ -363,7 +363,7 @@ void BKE_object_eval_update_shading(Depsgraph *depsgraph, Object *object)
 {
 	DEG_debug_print_eval(depsgraph, __func__, object->id.name, object);
 	if (object->type == OB_MESH) {
-		BKE_mesh_batch_cache_dirty(object->data, BKE_MESH_BATCH_DIRTY_SHADING);
+		BKE_mesh_batch_cache_dirty_tag(object->data, BKE_MESH_BATCH_DIRTY_SHADING);
 	}
 }
 
@@ -372,15 +372,15 @@ void BKE_object_data_select_update(Depsgraph *depsgraph, ID *object_data)
 	DEG_debug_print_eval(depsgraph, __func__, object_data->name, object_data);
 	switch (GS(object_data->name)) {
 		case ID_ME:
-			BKE_mesh_batch_cache_dirty((Mesh *)object_data,
+			BKE_mesh_batch_cache_dirty_tag((Mesh *)object_data,
 			                           BKE_CURVE_BATCH_DIRTY_SELECT);
 			break;
 		case ID_CU:
-			BKE_curve_batch_cache_dirty((Curve *)object_data,
+			BKE_curve_batch_cache_dirty_tag((Curve *)object_data,
 			                            BKE_CURVE_BATCH_DIRTY_SELECT);
 			break;
 		case ID_LT:
-			BKE_lattice_batch_cache_dirty((struct Lattice *)object_data,
+			BKE_lattice_batch_cache_dirty_tag((struct Lattice *)object_data,
 			                              BKE_CURVE_BATCH_DIRTY_SELECT);
 			break;
 		default:
@@ -423,7 +423,7 @@ void BKE_object_eval_flush_base_flags(Depsgraph *depsgraph,
 		     psys != NULL;
 		     psys = psys->next)
 		{
-			BKE_particle_batch_cache_dirty(psys, BKE_PARTICLE_BATCH_DIRTY_ALL);
+			BKE_particle_batch_cache_dirty_tag(psys, BKE_PARTICLE_BATCH_DIRTY_ALL);
 		}
 	}
 }
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index cb26f7e9f3e..6ccf4c1b761 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -993,7 +993,7 @@ void BKE_sculpt_update_mesh_elements(
 	}
 
 	/* 2.8x - avoid full mesh update! */
-	BKE_mesh_batch_cache_dirty(me, BKE_MESH_BATCH_DIRTY_SCULPT_COORDS);
+	BKE_mesh_batch_cache_dirty_tag(me, BKE_MESH_BATCH_DIRTY_SCULPT_COORDS);
 }
 
 int BKE_sculpt_mask_layers_ensure(Object *ob, MultiresModifierData *mmd)
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 82514f0c92d..4d4843928e2 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -4349,13 +4349,13 @@ void psys_apply_hair_lattice(Depsgraph *depsgraph, Scene *scene, Object *ob, Par
 
 
 /* Draw Engine */
-void (*BKE_particle_batch_cache_dirty_cb)(ParticleSystem *psys, int mode) = NULL;
+void (*BKE_particle_batch_cache_dirty_tag_cb)(ParticleSystem *psys, int mode) = NULL;
 void (*BKE_particle_batch_cache_free_cb)(ParticleSystem *psys) = NULL;
 
-void BKE_particle_batch_cache_dirty(ParticleSystem *psys, int mode)
+void BKE_particle_batch_cache_dirty_tag(ParticleSystem *psys, int mode)
 {
 	if (psys->batch_cache) {
-		BKE_particle_batch_cache_dirty_cb(psys, mode);
+		BKE_particle_batch_cache_dirty_tag_cb(psys, mode);
 	}
 }
 void BKE_particle_batch_cache_free(ParticleSystem *psys)
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index d195ce6fa0c..de4d25a95d9 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -4399,7 +4399,7 @@ void particle_system_update(struct Depsgraph *depsgraph, Scene *scene, Object *o
 	/* save matrix for duplicators, at rendertime the actual dupliobject's matrix is used so don't update! */
 	invert_m4_m4(psys->imat, ob->obmat);
 
-	BKE_particle_batch_cache_dirty(psys, BKE_PARTICLE_BATCH_DIRTY_ALL);
+	BKE_particle_batch_cache_dirty_tag(psys, BKE_PARTICLE_BATCH_DIRTY_ALL);
 }
 
 /* ID looper */