[Bf-blender-cvs] [b44cec0eca8] master: Cleanup: Remove unused DerivedMesh function

[Hans Goudey]

Commit: b44cec0eca8bb191abba3396dedd9a79e23386ef
Author: Hans Goudey
Date:   Sun May 15 12:20:13 2022 +0200
Branches: master
https://developer.blender.org/rBb44cec0eca8bb191abba3396dedd9a79e23386ef

Cleanup: Remove unused DerivedMesh function

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

M	source/blender/blenkernel/BKE_DerivedMesh.h
M	source/blender/blenkernel/intern/cdderivedmesh.c
M	source/blender/blenkernel/intern/subsurf_ccg.c

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

diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h
index fea5f515db8..3488f50a32b 100644
--- a/source/blender/blenkernel/BKE_DerivedMesh.h
+++ b/source/blender/blenkernel/BKE_DerivedMesh.h
@@ -125,7 +125,6 @@ struct DerivedMesh {
   /* Also called in Editmode */
   int (*getNumVerts)(DerivedMesh *dm);
   int (*getNumEdges)(DerivedMesh *dm);
-  int (*getNumTessFaces)(DerivedMesh *dm);
   int (*getNumLoops)(DerivedMesh *dm);
   int (*getNumPolys)(DerivedMesh *dm);
 
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 2d742a103af..93286751f92 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -65,18 +65,6 @@ static int cdDM_getNumEdges(DerivedMesh *dm)
   return dm->numEdgeData;
 }
 
-static int cdDM_getNumTessFaces(DerivedMesh *dm)
-{
-  /* uncomment and add a breakpoint on the printf()
-   * to help debug tessfaces issues since BMESH merge. */
-#if 0
-  if (dm->numTessFaceData == 0 && dm->numPolyData != 0) {
-    printf("%s: has no faces!\n");
-  }
-#endif
-  return dm->numTessFaceData;
-}
-
 static int cdDM_getNumLoops(DerivedMesh *dm)
 {
   return dm->numLoopData;
@@ -173,7 +161,6 @@ static CDDerivedMesh *cdDM_create(const char *desc)
 
   dm->getNumVerts = cdDM_getNumVerts;
   dm->getNumEdges = cdDM_getNumEdges;
-  dm->getNumTessFaces = cdDM_getNumTessFaces;
   dm->getNumLoops = cdDM_getNumLoops;
   dm->getNumPolys = cdDM_getNumPolys;
 
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index 96259f9c741..0abececd17b 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -567,11 +567,8 @@ static void ss_sync_ccg_from_derivedmesh(CCGSubSurf *ss,
   MEdge *me;
   MLoop *mloop = dm->getLoopArray(dm), *ml;
   MPoly *mpoly = dm->getPolyArray(dm), *mp;
-  // MFace *mf; /* UNUSED */
   int totvert = dm->getNumVerts(dm);
   int totedge = dm->getNumEdges(dm);
-  // int totface = dm->getNumTessFaces(dm); /* UNUSED */
-  // int totpoly = dm->getNumFaces(dm);     /* UNUSED */
   int i, j;
   int *index;
 
@@ -772,11 +769,6 @@ static int ccgDM_getNumPolys(DerivedMesh *dm)
   return ccgSubSurf_getNumFinalFaces(ccgdm->ss);
 }
 
-static int ccgDM_getNumTessFaces(DerivedMesh *dm)
-{
-  return dm->numTessFaceData;
-}
-
 static int ccgDM_getNumLoops(DerivedMesh *dm)
 {
   CCGDerivedMesh *ccgdm = (CCGDerivedMesh *)dm;
@@ -1511,10 +1503,7 @@ static void set_default_ccgdm_callbacks(CCGDerivedMesh *ccgdm)
   ccgdm->dm.getNumVerts = ccgDM_getNumVerts;
   ccgdm->dm.getNumEdges = ccgDM_getNumEdges;
   ccgdm->dm.getNumLoops = ccgDM_getNumLoops;
-  /* reuse of ccgDM_getNumTessFaces is intentional here:
-   * subsurf polys are just created from tessfaces */
   ccgdm->dm.getNumPolys = ccgDM_getNumPolys;
-  ccgdm->dm.getNumTessFaces = ccgDM_getNumTessFaces;
 
   ccgdm->dm.getVertCo = ccgDM_getFinalVertCo;
   ccgdm->dm.getVertNo = ccgDM_getFinalVertNo;