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 /source/blender/blenkernel/intern | |
| parent | fa69ce9e3a682426aa0d247f4720571889d5a6c2 (diff) | |
Cleanup: use 'nomain' when not in library data
Rename only.
Diffstat (limited to 'source/blender/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 19 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/mesh_merge.c | 2 |
2 files changed, 11 insertions, 10 deletions
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*/ |