diff options
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/cloth.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh_validate.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 4 |
6 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 00a2c45d8fd..097fb09b86b 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -2405,7 +2405,7 @@ DerivedMesh *CDDM_merge_verts(DerivedMesh *dm, const int *vtargetmap, const int STACK_DECLARE(mpoly); STACK_DECLARE(oldp); - EdgeHash *ehash = BLI_edgehash_new(); + EdgeHash *ehash = BLI_edgehash_new(__func__); int i, j, c; @@ -2607,7 +2607,7 @@ void CDDM_calc_edges_tessface(DerivedMesh *dm) EdgeHashIterator *ehi; MFace *mf = cddm->mface; MEdge *med; - EdgeHash *eh = BLI_edgehash_new(); + EdgeHash *eh = BLI_edgehash_new(__func__); int i, *index, numEdges, maxFaces = dm->numTessFaceData; for (i = 0; i < maxFaces; i++, mf++) { @@ -2668,7 +2668,7 @@ void CDDM_calc_edges(DerivedMesh *dm) MPoly *mp = cddm->mpoly; MLoop *ml; MEdge *med, *origmed; - EdgeHash *eh = BLI_edgehash_new(); + EdgeHash *eh = BLI_edgehash_new(__func__); int v1, v2; int *eindex; int i, j, *index, numEdges = cddm->dm.numEdgeData, maxFaces = dm->numPolyData; diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c index 05ffd4a6265..96c8cc7e507 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -1109,7 +1109,7 @@ static int cloth_build_springs ( ClothModifierData *clmd, DerivedMesh *dm ) MEM_freeN ( cloth->springs ); // create spring network hash - edgehash = BLI_edgehash_new(); + edgehash = BLI_edgehash_new(__func__); // structural springs for ( i = 0; i < numedges; i++ ) { diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index a6a85e82a4a..6170e989407 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -177,7 +177,7 @@ static int customdata_compare(CustomData *c1, CustomData *c2, Mesh *m1, Mesh *m2 if (l1->type == CD_MEDGE) { MEdge *e1 = l1->data; MEdge *e2 = l2->data; - EdgeHash *eh = BLI_edgehash_new(); + EdgeHash *eh = BLI_edgehash_new(__func__); int etot = m1->totedge; for (j = 0; j < etot; j++, e1++) { @@ -911,7 +911,7 @@ static void make_edges_mdata(MVert *UNUSED(allvert), MFace *allface, MLoop *alll MPoly *mpoly; MFace *mface; MEdge *medge, *med; - EdgeHash *hash = BLI_edgehash_new(); + EdgeHash *hash = BLI_edgehash_new(__func__); struct EdgeSort *edsort, *ed; int a, totedge = 0; unsigned int totedge_final = 0; @@ -1243,7 +1243,7 @@ static void make_edges_mdata_extend(MEdge **r_alledge, int *r_totedge, const MPoly *mp; int i; - eh = BLI_edgehash_new(); + eh = BLI_edgehash_new(__func__); for (i = 0, mp = mpoly; i < totpoly; i++, mp++) { BKE_mesh_poly_edgehash_insert(eh, mp, mloop + mp->loopstart); @@ -2307,7 +2307,7 @@ void BKE_mesh_convert_mfaces_to_mpolys_ex(ID *id, CustomData *fdata, CustomData CustomData_external_read(fdata, id, CD_MASK_MDISPS, totface_i); } - eh = BLI_edgehash_new(); + eh = BLI_edgehash_new(__func__); /* build edge hash */ me = medge; diff --git a/source/blender/blenkernel/intern/mesh_validate.c b/source/blender/blenkernel/intern/mesh_validate.c index 2eced15a147..512f205728d 100644 --- a/source/blender/blenkernel/intern/mesh_validate.c +++ b/source/blender/blenkernel/intern/mesh_validate.c @@ -216,7 +216,7 @@ int BKE_mesh_validate_arrays(Mesh *mesh, bool do_edge_recalc = false; - EdgeHash *edge_hash = BLI_edgehash_new(); + EdgeHash *edge_hash = BLI_edgehash_new(__func__); BLI_assert(!(do_fixes && mesh == NULL)); @@ -921,7 +921,7 @@ void BKE_mesh_calc_edges(Mesh *mesh, bool update, const bool select) EdgeHashIterator *ehi; MPoly *mp; MEdge *med, *med_orig; - EdgeHash *eh = BLI_edgehash_new(); + EdgeHash *eh = BLI_edgehash_new(__func__); int i, totedge, totpoly = mesh->totpoly; int med_index; /* select for newly created meshes which are selected [#25595] */ diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 8cb9404a647..f97098b43bf 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -2484,7 +2484,7 @@ static EdgeHash *sph_springhash_build(ParticleSystem *psys) ParticleSpring *spring; int i = 0; - springhash = BLI_edgehash_new(); + springhash = BLI_edgehash_new(__func__); for (i=0, spring=psys->fluid_springs; i<psys->tot_fluidsprings; i++, spring++) BLI_edgehash_insert(springhash, spring->particle_index[0], spring->particle_index[1], SET_INT_IN_POINTER(i+1)); diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 35482d9553d..696248f6940 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -334,7 +334,7 @@ static int ss_sync_from_uv(CCGSubSurf *ss, CCGSubSurf *origss, DerivedMesh *dm, } /* create edges */ - ehash = BLI_edgehash_new(); + ehash = BLI_edgehash_new(__func__); for (i = 0; i < totface; i++) { MPoly *mp = &((MPoly *) mpoly)[i]; @@ -1332,7 +1332,7 @@ static void ccgDM_copyFinalLoopArray(DerivedMesh *dm, MLoop *mloop) if (!ccgdm->ehash) { MEdge *medge; - ccgdm->ehash = BLI_edgehash_new(); + ccgdm->ehash = BLI_edgehash_new(__func__); medge = ccgdm->dm.getEdgeArray((DerivedMesh *)ccgdm); for (i = 0; i < ccgdm->dm.numEdgeData; i++) { |