Merge branch 'master' into blender-projects-basicsblender-projects-basics

1 files changed, 6 insertions, 23 deletions

diff --git a/source/blender/draw/intern/draw_cache.c b/source/blender/draw/intern/draw_cache.c
index 8c6a51442e1..00ac2563c43 100644
--- a/source/blender/draw/intern/draw_cache.c
+++ b/source/blender/draw/intern/draw_cache.c
@@ -899,8 +899,6 @@ GPUBatch *DRW_cache_object_surface_get(Object *ob)
   switch (ob->type) {
     case OB_MESH:
       return DRW_cache_mesh_surface_get(ob);
-    case OB_POINTCLOUD:
-      return DRW_cache_pointcloud_surface_get(ob);
     default:
       return NULL;
   }
@@ -959,8 +957,6 @@ GPUBatch **DRW_cache_object_surface_material_get(struct Object *ob,
   switch (ob->type) {
     case OB_MESH:
       return DRW_cache_mesh_surface_shaded_get(ob, gpumat_array, gpumat_array_len);
-    case OB_POINTCLOUD:
-      return DRW_cache_pointcloud_surface_shaded_get(ob, gpumat_array, gpumat_array_len);
     default:
       return NULL;
   }
@@ -3006,24 +3002,6 @@ GPUBatch *DRW_cache_lattice_vert_overlay_get(Object *ob)
 /** \name PointCloud
  * \{ */
 
-GPUBatch *DRW_cache_pointcloud_get_dots(Object *object)
-{
-  BLI_assert(object->type == OB_POINTCLOUD);
-  return DRW_pointcloud_batch_cache_get_dots(object);
-}
-
-GPUBatch *DRW_cache_pointcloud_surface_get(Object *object)
-{
-  BLI_assert(object->type == OB_POINTCLOUD);
-  return DRW_pointcloud_batch_cache_get_surface(object);
-}
-
-GPUBatch *DRW_cache_pointcloud_surface_viewer_attribute_get(Object *object)
-{
-  BLI_assert(object->type == OB_POINTCLOUD);
-  return DRW_pointcloud_batch_cache_get_surface_viewer_attribute(object);
-}
-
 /** \} */
 
 /* -------------------------------------------------------------------- */
@@ -3308,6 +3286,9 @@ void drw_batch_cache_generate_requested(Object *ob)
     case OB_CURVES:
       DRW_curves_batch_cache_create_requested(ob);
       break;
+    case OB_POINTCLOUD:
+      DRW_pointcloud_batch_cache_create_requested(ob);
+      break;
     /* TODO: all cases. */
     default:
       break;
@@ -3358,7 +3339,9 @@ void DRW_batch_cache_free_old(Object *ob, int ctime)
     case OB_CURVES:
       DRW_curves_batch_cache_free_old((Curves *)ob->data, ctime);
       break;
-    /* TODO: all cases. */
+    case OB_POINTCLOUD:
+      DRW_pointcloud_batch_cache_free_old((PointCloud *)ob->data, ctime);
+      break;
     default:
       break;
   }