[Bf-blender-cvs] [c8d31807d29] master: Cleanup: reduce CDDM use, remove unused function calls
Campbell Barton
noreply at git.blender.org
Wed Feb 26 05:26:30 CET 2020
Commit: c8d31807d298b3918d3d0a533771dc1e7cadf8c4
Author: Campbell Barton
Date: Wed Feb 26 14:24:57 2020 +1100
Branches: master
https://developer.blender.org/rBc8d31807d298b3918d3d0a533771dc1e7cadf8c4
Cleanup: reduce CDDM use, remove unused function calls
===================================================================
M source/blender/alembic/intern/alembic_capi.cc
M source/blender/blenkernel/BKE_cdderivedmesh.h
M source/blender/blenkernel/BKE_mesh.h
M source/blender/blenkernel/intern/DerivedMesh.c
M source/blender/blenkernel/intern/cdderivedmesh.c
M source/blender/blenkernel/intern/displist.c
M source/blender/blenkernel/intern/editmesh.c
M source/blender/blenkernel/intern/lattice.c
M source/blender/blenkernel/intern/modifier.c
M source/blender/blenkernel/intern/particle.c
M source/blender/bmesh/intern/bmesh_mesh.c
M source/blender/editors/mesh/editmesh_knife_project.c
M source/blender/editors/uvedit/uvedit_unwrap_ops.c
M source/blender/modifiers/intern/MOD_explode.c
M source/blender/modifiers/intern/MOD_fluid.c
M source/blender/modifiers/intern/MOD_subsurf.c
M source/blender/modifiers/intern/MOD_weighted_normal.c
===================================================================
diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc
index 6c7ab4d4b87..c6f9e284d53 100644
--- a/source/blender/alembic/intern/alembic_capi.cc
+++ b/source/blender/alembic/intern/alembic_capi.cc
@@ -48,7 +48,6 @@ extern "C" {
#include "DNA_scene_types.h"
#include "BKE_cachefile.h"
-#include "BKE_cdderivedmesh.h"
#include "BKE_context.h"
#include "BKE_curve.h"
#include "BKE_global.h"
diff --git a/source/blender/blenkernel/BKE_cdderivedmesh.h b/source/blender/blenkernel/BKE_cdderivedmesh.h
index d39850a162b..7b84f2f04ab 100644
--- a/source/blender/blenkernel/BKE_cdderivedmesh.h
+++ b/source/blender/blenkernel/BKE_cdderivedmesh.h
@@ -22,59 +22,24 @@
* \section aboutcdderivedmesh CDDerivedMesh interface
* CDDerivedMesh (CD = Custom Data) is a DerivedMesh backend which stores
* mesh elements (vertices, edges and faces) as layers of custom element data.
+ *
+ * \note This is deprecated & should eventually be removed.
*/
#ifndef __BKE_CDDERIVEDMESH_H__
#define __BKE_CDDERIVEDMESH_H__
-#include "BKE_DerivedMesh.h"
-#include "BKE_customdata.h"
-
-struct BMEditMesh;
-struct CustomData_MeshMasks;
struct DerivedMesh;
struct Mesh;
-/* creates a new CDDerivedMesh */
-struct DerivedMesh *CDDM_new(int numVerts, int numEdges, int numFaces, int numLoops, int numPolys);
-
/* creates a CDDerivedMesh from the given Mesh, this will reference the
* original data in Mesh, but it is safe to apply vertex coordinates or
* calculate normals as those functions will automatically create new
- * data to not overwrite the original */
+ * data to not overwrite the original. */
struct DerivedMesh *CDDM_from_mesh(struct Mesh *mesh);
-/* creates a CDDerivedMesh from the given Mesh with custom allocation type. */
-struct DerivedMesh *CDDM_from_mesh_ex(struct Mesh *mesh,
- eCDAllocType alloctype,
- const struct CustomData_MeshMasks *mask);
-
/* Copies the given DerivedMesh with verts, faces & edges stored as
- * custom element data.
- */
+ * custom element data. */
struct DerivedMesh *CDDM_copy(struct DerivedMesh *dm);
-void CDDM_recalc_looptri(struct DerivedMesh *dm);
-
-/* vertex/edge/face access functions
- * should always succeed if index is within bounds
- * note these return pointers - any change modifies the internals of the mesh
- */
-struct MVert *CDDM_get_vert(struct DerivedMesh *dm, int index);
-struct MEdge *CDDM_get_edge(struct DerivedMesh *dm, int index);
-struct MFace *CDDM_get_tessface(struct DerivedMesh *dm, int index);
-struct MLoop *CDDM_get_loop(struct DerivedMesh *dm, int index);
-struct MPoly *CDDM_get_poly(struct DerivedMesh *dm, int index);
-
-/* vertex/edge/face array access functions - return the array holding the
- * desired data
- * should always succeed
- * note these return pointers - any change modifies the internals of the mesh
- */
-struct MVert *CDDM_get_verts(struct DerivedMesh *dm);
-struct MEdge *CDDM_get_edges(struct DerivedMesh *dm);
-struct MFace *CDDM_get_tessfaces(struct DerivedMesh *dm);
-struct MLoop *CDDM_get_loops(struct DerivedMesh *dm);
-struct MPoly *CDDM_get_polys(struct DerivedMesh *dm);
-
#endif
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h
index d6934e8a7da..1bc70101803 100644
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@ -129,7 +129,7 @@ struct Mesh *BKE_mesh_new_nomain_from_template_ex(const struct Mesh *me_src,
int tessface_len,
int loops_len,
int polys_len,
- CustomData_MeshMasks mask);
+ struct CustomData_MeshMasks mask);
void BKE_mesh_eval_delete(struct Mesh *me_eval);
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index c04079bed22..0e532fdedc2 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -43,7 +43,7 @@
#include "BLI_linklist.h"
#include "BLI_task.h"
-#include "BKE_cdderivedmesh.h"
+#include "BKE_DerivedMesh.h"
#include "BKE_colorband.h"
#include "BKE_editmesh.h"
#include "BKE_key.h"
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 5fc4e909fac..65297ba630c 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -29,6 +29,7 @@
#include "BLI_math.h"
#include "BLI_utildefines.h"
+#include "BKE_DerivedMesh.h"
#include "BKE_pbvh.h"
#include "BKE_cdderivedmesh.h"
#include "BKE_mesh.h"
@@ -193,7 +194,7 @@ static const MeshElemMap *cdDM_getPolyMap(Object *ob, DerivedMesh *dm)
return cddm->pmap;
}
-void CDDM_recalc_looptri(DerivedMesh *dm)
+static void cdDM_recalc_looptri(DerivedMesh *dm)
{
CDDerivedMesh *cddm = (CDDerivedMesh *)dm;
const unsigned int totpoly = dm->numPolyData;
@@ -265,7 +266,7 @@ static CDDerivedMesh *cdDM_create(const char *desc)
dm->getEdgeDataArray = DM_get_edge_data_layer;
dm->getTessFaceDataArray = DM_get_tessface_data_layer;
- dm->recalcLoopTri = CDDM_recalc_looptri;
+ dm->recalcLoopTri = cdDM_recalc_looptri;
dm->getVertCo = cdDM_getVertCo;
dm->getVertNo = cdDM_getVertNo;
@@ -277,41 +278,9 @@ static CDDerivedMesh *cdDM_create(const char *desc)
return cddm;
}
-DerivedMesh *CDDM_new(int numVerts, int numEdges, int numTessFaces, int numLoops, int numPolys)
-{
- CDDerivedMesh *cddm = cdDM_create("CDDM_new dm");
- DerivedMesh *dm = &cddm->dm;
-
- DM_init(dm, DM_TYPE_CDDM, numVerts, numEdges, numTessFaces, numLoops, numPolys);
-
- CustomData_add_layer(&dm->vertData, CD_ORIGINDEX, CD_CALLOC, NULL, numVerts);
- CustomData_add_layer(&dm->edgeData, CD_ORIGINDEX, CD_CALLOC, NULL, numEdges);
- CustomData_add_layer(&dm->faceData, CD_ORIGINDEX, CD_CALLOC, NULL, numTessFaces);
- CustomData_add_layer(&dm->polyData, CD_ORIGINDEX, CD_CALLOC, NULL, numPolys);
-
- CustomData_add_layer(&dm->vertData, CD_MVERT, CD_CALLOC, NULL, numVerts);
- CustomData_add_layer(&dm->edgeData, CD_MEDGE, CD_CALLOC, NULL, numEdges);
- CustomData_add_layer(&dm->faceData, CD_MFACE, CD_CALLOC, NULL, numTessFaces);
- CustomData_add_layer(&dm->loopData, CD_MLOOP, CD_CALLOC, NULL, numLoops);
- CustomData_add_layer(&dm->polyData, CD_MPOLY, CD_CALLOC, NULL, numPolys);
-
- cddm->mvert = CustomData_get_layer(&dm->vertData, CD_MVERT);
- cddm->medge = CustomData_get_layer(&dm->edgeData, CD_MEDGE);
- cddm->mface = CustomData_get_layer(&dm->faceData, CD_MFACE);
- cddm->mloop = CustomData_get_layer(&dm->loopData, CD_MLOOP);
- cddm->mpoly = CustomData_get_layer(&dm->polyData, CD_MPOLY);
-
- return dm;
-}
-
-DerivedMesh *CDDM_from_mesh(Mesh *mesh)
-{
- return CDDM_from_mesh_ex(mesh, CD_REFERENCE, &CD_MASK_MESH);
-}
-
-DerivedMesh *CDDM_from_mesh_ex(Mesh *mesh,
- eCDAllocType alloctype,
- const CustomData_MeshMasks *mask)
+static DerivedMesh *cdDM_from_mesh_ex(Mesh *mesh,
+ eCDAllocType alloctype,
+ const CustomData_MeshMasks *mask)
{
CDDerivedMesh *cddm = cdDM_create(__func__);
DerivedMesh *dm = &cddm->dm;
@@ -370,6 +339,11 @@ DerivedMesh *CDDM_from_mesh_ex(Mesh *mesh,
return dm;
}
+DerivedMesh *CDDM_from_mesh(Mesh *mesh)
+{
+ return cdDM_from_mesh_ex(mesh, CD_REFERENCE, &CD_MASK_MESH);
+}
+
DerivedMesh *CDDM_copy(DerivedMesh *source)
{
CDDerivedMesh *cddm = cdDM_create("CDDM_copy cddm");
@@ -415,62 +389,3 @@ DerivedMesh *CDDM_copy(DerivedMesh *source)
return dm;
}
-
-/* #define DEBUG_CLNORS */
-#ifdef DEBUG_CLNORS
-# include "BLI_linklist.h"
-#endif
-
-/* mesh element access functions */
-
-MVert *CDDM_get_vert(DerivedMesh *dm, int index)
-{
- return &((CDDerivedMesh *)dm)->mvert[index];
-}
-
-MEdge *CDDM_get_edge(DerivedMesh *dm, int index)
-{
- return &((CDDerivedMesh *)dm)->medge[index];
-}
-
-MFace *CDDM_get_tessface(DerivedMesh *dm, int index)
-{
- return &((CDDerivedMesh *)dm)->mface[index];
-}
-
-MLoop *CDDM_get_loop(DerivedMesh *dm, int index)
-{
- return &((CDDerivedMesh *)dm)->mloop[index];
-}
-
-MPoly *CDDM_get_poly(DerivedMesh *dm, int index)
-{
- return &((CDDerivedMesh *)dm)->mpoly[index];
-}
-
-/* array access functions */
-
-MVert *CDDM_get_verts(DerivedMesh *dm)
-{
- return ((CDDerivedMesh *)dm)->mvert;
-}
-
-MEdge *CDDM_get_edges(DerivedMesh *dm)
-{
- return ((CDDerivedMesh *)dm)->medge;
-}
-
-MFace *CDDM_get_tessfaces(DerivedMesh *dm)
-{
- return ((CDDerivedMesh *)dm)->mface;
-}
-
-MLoop *CDDM_get_loops(DerivedMesh *dm)
-{
- return ((CDDerivedMesh *)dm)->mloop;
-}
-
-MPoly *CDDM_get_polys(DerivedMesh *dm)
-{
- return ((CDDerivedMesh *)dm)->mpoly;
-}
diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c
index fc310ee720a..6d7d42b2293 100644
--- a/source/blender/blenkernel/intern/displist.c
+++ b/source/blender/blenkernel/intern/displist.c
@@ -33,15 +33,16 @@
#include "DNA_object_types.h"
#include "DNA_vfont_types.h"
-#include "BLI_blenlib.h"
-#include "BLI_memarena.h"
+#include "BLI_bitmap.h"
+#include "BLI_linklist.h"
+#include "BLI_listbase.h"
#include "BLI_math.h"
+#include "BLI_memarena.h"
#include "BLI_scanfill.h"
+#include "BLI_string.h"
#include "BLI_utildefines.h"
-#include "BLI_linklist.h"
#include "BKE_displist.h"
-#include "BKE_cdderivedmesh.h"
#include "BKE_object.h"
#include "BKE_lib_id.h"
#include "BKE_mball.h"
diff --git a/source/blender/blenkernel/intern/editmesh.c b/source/blender/blenkernel/intern/editmesh.c
index 4c076256d9f..5f727c2d01e 100644
--- a/source/blender/blenkernel/intern/editmesh.c
+++ b/source/blender/blenkernel/intern/editmesh.c
@@ -27,10 +27,11 @@
#include "DNA_object_types.h"
#include "DNA_mesh_types.h"
+#include "BLI_bitmap.h"
#include "BLI_math.h"
+#include "BKE_DerivedMesh.h"
#include "BKE_editmesh.h"
-#include "BKE_cdderivedmesh.h"
#include
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list