diff options
-rw-r--r-- | source/blender/blenkernel/BKE_mesh.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 2 | ||||
-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 |
7 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index 11b474fe7c0..485132bfa6d 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -81,7 +81,7 @@ struct BMesh *BKE_mesh_to_bmesh( struct Mesh *me, struct Object *ob, const bool add_key_index, const struct BMeshCreateParams *params); -struct Mesh *BKE_bmesh_to_mesh(struct BMesh *bm, const struct BMeshToMeshParams *params); +struct Mesh *BKE_bmesh_to_mesh_nomain(struct BMesh *bm, const struct BMeshToMeshParams *params); int poly_find_loop_from_vert( const struct MPoly *poly, diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index d4c159d33ac..cece1a7c4c6 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -738,7 +738,7 @@ BMesh *BKE_mesh_to_bmesh( }); } -Mesh *BKE_bmesh_to_mesh(BMesh *bm, const struct BMeshToMeshParams *params) +Mesh *BKE_bmesh_to_mesh_nomain(BMesh *bm, const struct BMeshToMeshParams *params) { Mesh *mesh = BKE_id_new_nomain(ID_ME, NULL); BM_mesh_bm_to_me(bm, mesh, params); 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; |