From 301a27187c83e0ea45fa51dd550e7d6978f34828 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 30 May 2018 10:22:28 +0200 Subject: Cleanup: More typed allocation type enum usage Majority of the code is EOL, but still handy for debug purposes. --- source/blender/blenkernel/BKE_DerivedMesh.h | 10 +++++----- source/blender/blenkernel/BKE_cdderivedmesh.h | 2 +- source/blender/blenkernel/intern/DerivedMesh.c | 12 ++++++------ source/blender/blenkernel/intern/cdderivedmesh.c | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h index 74416bcd18f..50aa82b83d4 100644 --- a/source/blender/blenkernel/BKE_DerivedMesh.h +++ b/source/blender/blenkernel/BKE_DerivedMesh.h @@ -398,19 +398,19 @@ void DM_set_only_copy(DerivedMesh *dm, CustomDataMask mask); * freed, see BKE_customdata.h for the different options */ void DM_add_vert_layer( - struct DerivedMesh *dm, int type, int alloctype, + struct DerivedMesh *dm, int type, CDAllocType alloctype, void *layer); void DM_add_edge_layer( - struct DerivedMesh *dm, int type, int alloctype, + struct DerivedMesh *dm, int type, CDAllocType alloctype, void *layer); void DM_add_tessface_layer( - struct DerivedMesh *dm, int type, int alloctype, + struct DerivedMesh *dm, int type, CDAllocType alloctype, void *layer); void DM_add_loop_layer( - DerivedMesh *dm, int type, int alloctype, + DerivedMesh *dm, int type, CDAllocType alloctype, void *layer); void DM_add_poly_layer( - struct DerivedMesh *dm, int type, int alloctype, + struct DerivedMesh *dm, int type, CDAllocType alloctype, void *layer); /* custom data access functions diff --git a/source/blender/blenkernel/BKE_cdderivedmesh.h b/source/blender/blenkernel/BKE_cdderivedmesh.h index 8277fa0439d..27eb57bd1b2 100644 --- a/source/blender/blenkernel/BKE_cdderivedmesh.h +++ b/source/blender/blenkernel/BKE_cdderivedmesh.h @@ -55,7 +55,7 @@ struct DerivedMesh *CDDM_new(int numVerts, int numEdges, int numFaces, 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, int alloctype, CustomDataMask mask); +struct DerivedMesh *CDDM_from_mesh_ex(struct Mesh *mesh, CDAllocType alloctype, CustomDataMask mask); struct DerivedMesh *CDDM_from_bmesh(struct BMesh *bm, const bool use_mdisps); diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 8bf7ac3f6a2..5ed7f6664a1 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -716,7 +716,7 @@ void DM_to_mesh(DerivedMesh *dm, Mesh *me, Object *ob, CustomDataMask mask, bool Mesh tmp = *me; int totvert, totedge /*, totface */ /* UNUSED */, totloop, totpoly; int did_shapekeys = 0; - int alloctype = CD_DUPLICATE; + CDAllocType alloctype = CD_DUPLICATE; if (take_ownership && dm->type == DM_TYPE_CDDM && dm->needsFree) { bool has_any_referenced_layers = @@ -911,27 +911,27 @@ static void mesh_set_only_copy(Mesh *mesh, CustomDataMask mask) #endif } -void DM_add_vert_layer(DerivedMesh *dm, int type, int alloctype, void *layer) +void DM_add_vert_layer(DerivedMesh *dm, int type, CDAllocType alloctype, void *layer) { CustomData_add_layer(&dm->vertData, type, alloctype, layer, dm->numVertData); } -void DM_add_edge_layer(DerivedMesh *dm, int type, int alloctype, void *layer) +void DM_add_edge_layer(DerivedMesh *dm, int type, CDAllocType alloctype, void *layer) { CustomData_add_layer(&dm->edgeData, type, alloctype, layer, dm->numEdgeData); } -void DM_add_tessface_layer(DerivedMesh *dm, int type, int alloctype, void *layer) +void DM_add_tessface_layer(DerivedMesh *dm, int type, CDAllocType alloctype, void *layer) { CustomData_add_layer(&dm->faceData, type, alloctype, layer, dm->numTessFaceData); } -void DM_add_loop_layer(DerivedMesh *dm, int type, int alloctype, void *layer) +void DM_add_loop_layer(DerivedMesh *dm, int type, CDAllocType alloctype, void *layer) { CustomData_add_layer(&dm->loopData, type, alloctype, layer, dm->numLoopData); } -void DM_add_poly_layer(DerivedMesh *dm, int type, int alloctype, void *layer) +void DM_add_poly_layer(DerivedMesh *dm, int type, CDAllocType alloctype, void *layer) { CustomData_add_layer(&dm->polyData, type, alloctype, layer, dm->numPolyData); } diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 19d1d1e0ede..346cea7150e 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -597,7 +597,7 @@ DerivedMesh *CDDM_from_mesh(Mesh *mesh) return CDDM_from_mesh_ex(mesh, CD_REFERENCE, CD_MASK_MESH); } -DerivedMesh *CDDM_from_mesh_ex(Mesh *mesh, int alloctype, CustomDataMask mask) +DerivedMesh *CDDM_from_mesh_ex(Mesh *mesh, CDAllocType alloctype, CustomDataMask mask) { CDDerivedMesh *cddm = cdDM_create(__func__); DerivedMesh *dm = &cddm->dm; -- cgit v1.2.3