diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-05-08 18:06:30 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-08 18:06:30 +0300 |
commit | 0e964afaa4ad3f836f371f5b15a2c2275bdcb0f7 (patch) | |
tree | d1795e9f2825b5e4448e3dcf9be9308dc8dea506 | |
parent | fa69ce9e3a682426aa0d247f4720571889d5a6c2 (diff) |
Cleanup: use 'nomain' when not in library data
Rename only.
-rw-r--r-- | source/blender/blenkernel/BKE_mesh.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 19 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh_merge.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_array.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_build.c | 5 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_mirror.c | 3 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_skin.c | 9 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_solidify.c | 11 |
8 files changed, 29 insertions, 24 deletions
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index cce637aa4ba..62650e53b12 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -102,7 +102,7 @@ void BKE_mesh_update_customdata_pointers(struct Mesh *me, const bool do_ensure_t void BKE_mesh_ensure_skin_customdata(struct Mesh *me); struct Mesh *BKE_mesh_new_nomain(int numVerts, int numEdges, int numTessFaces, int numLoops, int numPolys); -struct Mesh *BKE_mesh_from_template( +struct Mesh *BKE_mesh_new_nomain_from_template( const struct Mesh *me_src, int numVerts, int numEdges, int numTessFaces, int numLoops, int numPolys); diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 4fe2c3bf1ec..d8e92317f3f 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -651,7 +651,7 @@ Mesh *BKE_mesh_new_nomain(int numVerts, int numEdges, int numTessFaces, int numL return mesh; } -static Mesh *mesh_from_template_ex( +static Mesh *mesh_new_nomain_from_template_ex( const Mesh *me_src, int numVerts, int numEdges, int numTessFaces, int numLoops, int numPolys, @@ -692,15 +692,16 @@ static Mesh *mesh_from_template_ex( return me_dst; } -Mesh * BKE_mesh_from_template(const Mesh *me_src, - int numVerts, int numEdges, int numTessFaces, - int numLoops, int numPolys) +Mesh * BKE_mesh_new_nomain_from_template( + const Mesh *me_src, + int numVerts, int numEdges, int numTessFaces, + int numLoops, int numPolys) { - return mesh_from_template_ex( - me_src, - numVerts, numEdges, numTessFaces, - numLoops, numPolys, - CD_MASK_EVERYTHING); + return mesh_new_nomain_from_template_ex( + me_src, + numVerts, numEdges, numTessFaces, + numLoops, numPolys, + CD_MASK_EVERYTHING); } Mesh *BKE_mesh_copy(Main *bmain, const Mesh *me) diff --git a/source/blender/blenkernel/intern/mesh_merge.c b/source/blender/blenkernel/intern/mesh_merge.c index 899de970fdd..27ba7e76fa3 100644 --- a/source/blender/blenkernel/intern/mesh_merge.c +++ b/source/blender/blenkernel/intern/mesh_merge.c @@ -610,7 +610,7 @@ Mesh *BKE_mesh_merge_verts(Mesh *mesh, const int *vtargetmap, const int tot_vtar } /*create new cddm*/ - result = BKE_mesh_from_template( + result = BKE_mesh_new_nomain_from_template( mesh, STACK_SIZE(mvert), STACK_SIZE(medge), 0, STACK_SIZE(mloop), STACK_SIZE(mpoly)); /*update edge indices and copy customdata*/ diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index 45678947df5..d5a031af876 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -488,7 +488,7 @@ static Mesh *arrayModifier_doArray( result_npolys = chunk_npolys * count + start_cap_npolys + end_cap_npolys; /* Initialize a result dm */ - result = BKE_mesh_from_template(mesh, result_nverts, result_nedges, 0, result_nloops, result_npolys); + result = BKE_mesh_new_nomain_from_template(mesh, result_nverts, result_nedges, 0, result_nloops, result_npolys); result_dm_verts = result->mvert; if (use_merge) { diff --git a/source/blender/modifiers/intern/MOD_build.c b/source/blender/modifiers/intern/MOD_build.c index 7cb573c9e45..8e7e2e65169 100644 --- a/source/blender/modifiers/intern/MOD_build.c +++ b/source/blender/modifiers/intern/MOD_build.c @@ -217,8 +217,9 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, } /* now we know the number of verts, edges and faces, we can create the mesh. */ - result = BKE_mesh_from_template(mesh, BLI_ghash_len(vertHash), BLI_ghash_len(edgeHash), - 0, numLoops_dst, numFaces_dst); + result = BKE_mesh_new_nomain_from_template( + mesh, BLI_ghash_len(vertHash), BLI_ghash_len(edgeHash), + 0, numLoops_dst, numFaces_dst); /* copy the vertices across */ GHASH_ITER (gh_iter, vertHash) { diff --git a/source/blender/modifiers/intern/MOD_mirror.c b/source/blender/modifiers/intern/MOD_mirror.c index 53b6103de7f..36d610fa685 100644 --- a/source/blender/modifiers/intern/MOD_mirror.c +++ b/source/blender/modifiers/intern/MOD_mirror.c @@ -124,7 +124,8 @@ static Mesh *doMirrorOnAxis(MirrorModifierData *mmd, mul_m4_m4m4(mtx, itmp, mtx); } - result = BKE_mesh_from_template(mesh, maxVerts * 2, maxEdges * 2, 0, maxLoops * 2, maxPolys * 2); + result = BKE_mesh_new_nomain_from_template( + mesh, maxVerts * 2, maxEdges * 2, 0, maxLoops * 2, maxPolys * 2); /*copy customdata to original geometry*/ CustomData_copy_data(&mesh->vdata, &result->vdata, 0, 0, maxVerts); diff --git a/source/blender/modifiers/intern/MOD_skin.c b/source/blender/modifiers/intern/MOD_skin.c index ec7a9958109..60c324668d5 100644 --- a/source/blender/modifiers/intern/MOD_skin.c +++ b/source/blender/modifiers/intern/MOD_skin.c @@ -853,10 +853,11 @@ static Mesh *subdivide_base(Mesh *orig) MEM_freeN(degree); /* Allocate output derivedmesh */ - result = BKE_mesh_from_template(orig, - totorigvert + totsubd, - totorigedge + totsubd, - 0, 0, 0); + result = BKE_mesh_new_nomain_from_template( + orig, + totorigvert + totsubd, + totorigedge + totsubd, + 0, 0, 0); outvert = result->mvert; outedge = result->medge; diff --git a/source/blender/modifiers/intern/MOD_solidify.c b/source/blender/modifiers/intern/MOD_solidify.c index 6d830cabb27..b99b35bbb8e 100644 --- a/source/blender/modifiers/intern/MOD_solidify.c +++ b/source/blender/modifiers/intern/MOD_solidify.c @@ -360,11 +360,12 @@ static Mesh *applyModifier( mesh_calc_hq_normal(mesh, face_nors, vert_nors); } - result = BKE_mesh_from_template(mesh, - (int)((numVerts * stride) + newVerts), - (int)((numEdges * stride) + newEdges + rimVerts), 0, - (int)((numLoops * stride) + newLoops), - (int)((numFaces * stride) + newFaces)); + result = BKE_mesh_new_nomain_from_template( + mesh, + (int)((numVerts * stride) + newVerts), + (int)((numEdges * stride) + newEdges + rimVerts), 0, + (int)((numLoops * stride) + newLoops), + (int)((numFaces * stride) + newFaces)); mpoly = result->mpoly; mloop = result->mloop; |