[Bf-blender-cvs] [f8b1483566c] master: Cleanup: Remove unused object batch cache API function

[Hans Goudey]

Commit: f8b1483566ccc096f54c32c93955b003ee77e32a
Author: Hans Goudey
Date:   Tue Aug 9 13:03:35 2022 -0500
Branches: master
https://developer.blender.org/rBf8b1483566ccc096f54c32c93955b003ee77e32a

Cleanup: Remove unused object batch cache API function

Remove the "tag batch cache dirty" function specifically  for object data,
since it isn't used. Ref D14593

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

M	source/blender/blenkernel/BKE_object.h
M	source/blender/blenkernel/intern/object_update.c

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

diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h
index f0eb16a819d..8f3b488c7db 100644
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@ -586,7 +586,6 @@ void BKE_object_runtime_reset_on_copy(struct Object *object, int flag);
 void BKE_object_runtime_free_data(struct Object *object);
 
 void BKE_object_batch_cache_dirty_tag(struct Object *ob);
-void BKE_object_data_batch_cache_dirty_tag(struct ID *object_data);
 
 /* this function returns a superset of the scenes selection based on relationships */
 
diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c
index 1f7df2773dc..99c4d92d284 100644
--- a/source/blender/blenkernel/intern/object_update.c
+++ b/source/blender/blenkernel/intern/object_update.c
@@ -281,45 +281,39 @@ void BKE_object_eval_uber_transform(Depsgraph *UNUSED(depsgraph), Object *UNUSED
 {
 }
 
-void BKE_object_data_batch_cache_dirty_tag(ID *object_data)
+void BKE_object_batch_cache_dirty_tag(Object *ob)
 {
-  switch (GS(object_data->name)) {
-    case ID_ME:
-      BKE_mesh_batch_cache_dirty_tag((struct Mesh *)object_data, BKE_MESH_BATCH_DIRTY_ALL);
+  switch (ob->type) {
+    case OB_MESH:
+      BKE_mesh_batch_cache_dirty_tag((struct Mesh *)ob->data, BKE_MESH_BATCH_DIRTY_ALL);
       break;
-    case ID_LT:
-      BKE_lattice_batch_cache_dirty_tag((struct Lattice *)object_data,
-                                        BKE_LATTICE_BATCH_DIRTY_ALL);
+    case OB_LATTICE:
+      BKE_lattice_batch_cache_dirty_tag((struct Lattice *)ob->data, BKE_LATTICE_BATCH_DIRTY_ALL);
       break;
-    case ID_CU_LEGACY:
-      BKE_curve_batch_cache_dirty_tag((struct Curve *)object_data, BKE_CURVE_BATCH_DIRTY_ALL);
+    case OB_CURVES_LEGACY:
+      BKE_curve_batch_cache_dirty_tag((struct Curve *)ob->data, BKE_CURVE_BATCH_DIRTY_ALL);
       break;
-    case ID_MB:
-      BKE_mball_batch_cache_dirty_tag((struct MetaBall *)object_data, BKE_MBALL_BATCH_DIRTY_ALL);
+    case OB_MBALL:
+      BKE_mball_batch_cache_dirty_tag((struct MetaBall *)ob->data, BKE_MBALL_BATCH_DIRTY_ALL);
       break;
-    case ID_GD:
-      BKE_gpencil_batch_cache_dirty_tag((struct bGPdata *)object_data);
+    case OB_GPENCIL:
+      BKE_gpencil_batch_cache_dirty_tag((struct bGPdata *)ob->data);
       break;
-    case ID_CV:
-      BKE_curves_batch_cache_dirty_tag((struct Curves *)object_data, BKE_CURVES_BATCH_DIRTY_ALL);
+    case OB_CURVES:
+      BKE_curves_batch_cache_dirty_tag((struct Curves *)ob->data, BKE_CURVES_BATCH_DIRTY_ALL);
       break;
-    case ID_PT:
-      BKE_pointcloud_batch_cache_dirty_tag((struct PointCloud *)object_data,
+    case OB_POINTCLOUD:
+      BKE_pointcloud_batch_cache_dirty_tag((struct PointCloud *)ob->data,
                                            BKE_POINTCLOUD_BATCH_DIRTY_ALL);
       break;
-    case ID_VO:
-      BKE_volume_batch_cache_dirty_tag((struct Volume *)object_data, BKE_VOLUME_BATCH_DIRTY_ALL);
+    case OB_VOLUME:
+      BKE_volume_batch_cache_dirty_tag((struct Volume *)ob->data, BKE_VOLUME_BATCH_DIRTY_ALL);
       break;
     default:
       break;
   }
 }
 
-void BKE_object_batch_cache_dirty_tag(Object *ob)
-{
-  BKE_object_data_batch_cache_dirty_tag(ob->data);
-}
-
 void BKE_object_eval_uber_data(Depsgraph *depsgraph, Scene *scene, Object *ob)
 {
   DEG_debug_print_eval(depsgraph, __func__, ob->id.name, ob);