diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-08 12:03:16 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-08 12:04:20 +0300 |
commit | 50e31136fd5b0d26d1a2880a1c895c2809317d50 (patch) | |
tree | 504f04688785c9462daaf57f89e3a83b5f954cdf /source/blender/modifiers | |
parent | cf7c3462edfea7bd75629b1ab5eb9059131c2224 (diff) |
Rename BKE_bmesh_to_mesh to BKE_bmesh_to_mesh_nomain.
Let's be clear about functions generating datablocks outside of Main
database.
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r-- | source/blender/modifiers/intern/MOD_armature.c | 4 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_bevel.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_lattice.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_skin.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_wireframe.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c index 6644e5383df..dc255ff2f12 100644 --- a/source/blender/modifiers/intern/MOD_armature.c +++ b/source/blender/modifiers/intern/MOD_armature.c @@ -138,7 +138,7 @@ static void deformVertsEM( Mesh *mesh_src = mesh; if (!mesh) { - mesh_src = BKE_bmesh_to_mesh(em->bm, &(struct BMeshToMeshParams){0}); + mesh_src = BKE_bmesh_to_mesh_nomain(em->bm, &(struct BMeshToMeshParams){0}); } modifier_vgroup_cache(md, vertexCos); /* if next modifier needs original vertices */ @@ -166,7 +166,7 @@ static void deformMatricesEM( Mesh *mesh_src = mesh; if (!mesh) { - mesh_src = BKE_bmesh_to_mesh(em->bm, &(struct BMeshToMeshParams){0}); + mesh_src = BKE_bmesh_to_mesh_nomain(em->bm, &(struct BMeshToMeshParams){0}); } armature_deform_verts(amd->object, ctx->object, mesh_src, vertexCos, defMats, numVerts, diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c index 9e5913af6c9..7999a79bb08 100644 --- a/source/blender/modifiers/intern/MOD_bevel.c +++ b/source/blender/modifiers/intern/MOD_bevel.c @@ -177,7 +177,7 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes vertex_only, bmd->lim_flags & MOD_BEVEL_WEIGHT, do_clamp, dvert, vgroup, mat, loop_slide); - result = BKE_bmesh_to_mesh(bm, &(struct BMeshToMeshParams){0}); + result = BKE_bmesh_to_mesh_nomain(bm, &(struct BMeshToMeshParams){0}); BLI_assert(bm->vtoolflagpool == NULL && bm->etoolflagpool == NULL && diff --git a/source/blender/modifiers/intern/MOD_lattice.c b/source/blender/modifiers/intern/MOD_lattice.c index 87933558d86..84e7e41efcb 100644 --- a/source/blender/modifiers/intern/MOD_lattice.c +++ b/source/blender/modifiers/intern/MOD_lattice.c @@ -124,7 +124,7 @@ static void deformVertsEM( struct Mesh *mesh_src = mesh; if (!mesh) { - mesh_src = BKE_bmesh_to_mesh(em->bm, &(struct BMeshToMeshParams){0}); + mesh_src = BKE_bmesh_to_mesh_nomain(em->bm, &(struct BMeshToMeshParams){0}); } deformVerts(md, ctx, mesh_src, vertexCos, numVerts); diff --git a/source/blender/modifiers/intern/MOD_skin.c b/source/blender/modifiers/intern/MOD_skin.c index defb661d9d8..1e02ad40e12 100644 --- a/source/blender/modifiers/intern/MOD_skin.c +++ b/source/blender/modifiers/intern/MOD_skin.c @@ -1865,7 +1865,7 @@ static Mesh *base_skin(Mesh *origmesh, if (!bm) return NULL; - result = BKE_bmesh_to_mesh(bm, &(struct BMeshToMeshParams){0}); + result = BKE_bmesh_to_mesh_nomain(bm, &(struct BMeshToMeshParams){0}); BM_mesh_free(bm); result->runtime.cd_dirty_vert |= CD_MASK_NORMAL; diff --git a/source/blender/modifiers/intern/MOD_wireframe.c b/source/blender/modifiers/intern/MOD_wireframe.c index 3c6717d3b36..d3964b5c36f 100644 --- a/source/blender/modifiers/intern/MOD_wireframe.c +++ b/source/blender/modifiers/intern/MOD_wireframe.c @@ -103,7 +103,7 @@ static Mesh *WireframeModifier_do(WireframeModifierData *wmd, Object *ob, Mesh * MAX2(ob->totcol - 1, 0), false); - result = BKE_bmesh_to_mesh(bm, &(struct BMeshToMeshParams){0}); + result = BKE_bmesh_to_mesh_nomain(bm, &(struct BMeshToMeshParams){0}); BM_mesh_free(bm); result->runtime.cd_dirty_vert |= CD_MASK_NORMAL; |