[Bf-blender-cvs] [450a1900956] master: Cleanup: Remove unused subsurf ccg functions

[Hans Goudey]

Commit: 450a19009569c6119684d578de64e6b78df030e1
Author: Hans Goudey
Date:   Sun May 15 12:12:14 2022 +0200
Branches: master
https://developer.blender.org/rB450a19009569c6119684d578de64e6b78df030e1

Cleanup: Remove unused subsurf ccg functions

This simplifies some refactoring to mesh hide flags (see D14685).

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

M	source/blender/blenkernel/BKE_subsurf.h
M	source/blender/blenkernel/intern/subsurf_ccg.c

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

diff --git a/source/blender/blenkernel/BKE_subsurf.h b/source/blender/blenkernel/BKE_subsurf.h
index 5dd2935ad0d..f32a78c3015 100644
--- a/source/blender/blenkernel/BKE_subsurf.h
+++ b/source/blender/blenkernel/BKE_subsurf.h
@@ -61,27 +61,6 @@ int BKE_ccg_gridsize(int level);
  */
 int BKE_ccg_factor(int low_level, int high_level);
 
-/**
- * Translate #GridHidden into the #ME_HIDE flag for MVerts. Assumes
- * vertices are in the order output by #ccgDM_copyFinalVertArray.
- */
-void subsurf_copy_grid_hidden(struct DerivedMesh *dm,
-                              const struct MPoly *mpoly,
-                              struct MVert *mvert,
-                              const struct MDisps *mdisps);
-
-/**
- * Translate #GridPaintMask into vertex paint masks. Assumes vertices
- * are in the order output by #ccgDM_copyFinalVertArray.
- */
-void subsurf_copy_grid_paint_mask(struct DerivedMesh *dm,
-                                  const struct MPoly *mpoly,
-                                  float *paint_mask,
-                                  const struct GridPaintMask *grid_paint_mask);
-
-bool subsurf_has_edges(struct DerivedMesh *dm);
-bool subsurf_has_faces(struct DerivedMesh *dm);
-
 typedef enum MultiresModifiedFlags {
   /* indicates the grids have been sculpted on, so MDisps
    * have to be updated */
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index 152a565fc9c..96259f9c741 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -882,86 +882,6 @@ static void ccgDM_getFinalVertNo(DerivedMesh *dm, int vertNum, float r_no[3])
   copy_v3_v3(r_no, CCG_elem_no(&key, vd));
 }
 
-void subsurf_copy_grid_hidden(DerivedMesh *dm,
-                              const MPoly *mpoly,
-                              MVert *mvert,
-                              const MDisps *mdisps)
-{
-  CCGDerivedMesh *ccgdm = (CCGDerivedMesh *)dm;
-  CCGSubSurf *ss = ccgdm->ss;
-  int level = ccgSubSurf_getSubdivisionLevels(ss);
-  int gridSize = ccgSubSurf_getGridSize(ss);
-  int edgeSize = ccgSubSurf_getEdgeSize(ss);
-  int totface = ccgSubSurf_getNumFaces(ss);
-  int i, j, x, y;
-
-  for (i = 0; i < totface; i++) {
-    CCGFace *f = ccgdm->faceMap[i].face;
-
-    for (j = 0; j < mpoly[i].totloop; j++) {
-      const MDisps *md = &mdisps[mpoly[i].loopstart + j];
-      int hidden_gridsize = BKE_ccg_gridsize(md->level);
-      int factor = BKE_ccg_factor(level, md->level);
-      BLI_bitmap *hidden = md->hidden;
-
-      if (!hidden) {
-        continue;
-      }
-
-      for (y = 0; y < gridSize; y++) {
-        for (x = 0; x < gridSize; x++) {
-          int vndx, offset;
-
-          vndx = getFaceIndex(ss, f, j, x, y, edgeSize, gridSize);
-          offset = (y * factor) * hidden_gridsize + (x * factor);
-          if (BLI_BITMAP_TEST(hidden, offset)) {
-            mvert[vndx].flag |= ME_HIDE;
-          }
-        }
-      }
-    }
-  }
-}
-
-void subsurf_copy_grid_paint_mask(DerivedMesh *dm,
-                                  const MPoly *mpoly,
-                                  float *paint_mask,
-                                  const GridPaintMask *grid_paint_mask)
-{
-  CCGDerivedMesh *ccgdm = (CCGDerivedMesh *)dm;
-  CCGSubSurf *ss = ccgdm->ss;
-  int level = ccgSubSurf_getSubdivisionLevels(ss);
-  int gridSize = ccgSubSurf_getGridSize(ss);
-  int edgeSize = ccgSubSurf_getEdgeSize(ss);
-  int totface = ccgSubSurf_getNumFaces(ss);
-  int i, j, x, y, factor, gpm_gridsize;
-
-  for (i = 0; i < totface; i++) {
-    CCGFace *f = ccgdm->faceMap[i].face;
-    const MPoly *p = &mpoly[i];
-
-    for (j = 0; j < p->totloop; j++) {
-      const GridPaintMask *gpm = &grid_paint_mask[p->loopstart + j];
-      if (!gpm->data) {
-        continue;
-      }
-
-      factor = BKE_ccg_factor(level, gpm->level);
-      gpm_gridsize = BKE_ccg_gridsize(gpm->level);
-
-      for (y = 0; y < gridSize; y++) {
-        for (x = 0; x < gridSize; x++) {
-          int vndx, offset;
-
-          vndx = getFaceIndex(ss, f, j, x, y, edgeSize, gridSize);
-          offset = y * factor * gpm_gridsize + x * factor;
-          paint_mask[vndx] = gpm->data[offset];
-        }
-      }
-    }
-  }
-}
-
 /* utility function */
 BLI_INLINE void ccgDM_to_MVert(MVert *mv, const CCGKey *key, CCGElem *elem)
 {
@@ -2157,13 +2077,3 @@ void subsurf_calculate_limit_positions(Mesh *me, float (*r_positions)[3])
 
   dm->release(dm);
 }
-
-bool subsurf_has_edges(DerivedMesh *dm)
-{
-  return dm->getNumEdges(dm) != 0;
-}
-
-bool subsurf_has_faces(DerivedMesh *dm)
-{
-  return dm->getNumPolys(dm) != 0;
-}