archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Rename BKE_bmesh_to_mesh to BKE_bmesh_to_mesh_nomain.

Browse Source 
Let's be clear about functions generating datablocks outside of Main
database.
This commit is contained in:
Bastien Montagne
2018-05-08 11:03:16 +02:00
parent cf7c3462ed
commit 50e31136fd
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_mesh.h
View File

@@ -81,7 +81,7 @@ struct BMesh *BKE_mesh_to_bmesh(
struct Mesh *me, struct Object *ob, struct Mesh *me, struct Object *ob,
const bool add_key_index, const struct BMeshCreateParams *params); 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( int poly_find_loop_from_vert(
const struct MPoly *poly, const struct MPoly *poly,

2
source/blender/blenkernel/intern/mesh.c
View File

@@ -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); Mesh *mesh = BKE_id_new_nomain(ID_ME, NULL);
BM_mesh_bm_to_me(bm, mesh, params); BM_mesh_bm_to_me(bm, mesh, params);

4
source/blender/modifiers/intern/MOD_armature.c
View File

@@ -138,7 +138,7 @@ static void deformVertsEM(
Mesh *mesh_src = mesh; Mesh *mesh_src = mesh;
if (!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 */ modifier_vgroup_cache(md, vertexCos); /* if next modifier needs original vertices */
@@ -166,7 +166,7 @@ static void deformMatricesEM(
Mesh *mesh_src = mesh; Mesh *mesh_src = mesh;
if (!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, armature_deform_verts(amd->object, ctx->object, mesh_src, vertexCos, defMats, numVerts,

2
source/blender/modifiers/intern/MOD_bevel.c
View File

@@ -177,7 +177,7 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes
vertex_only, bmd->lim_flags & MOD_BEVEL_WEIGHT, do_clamp, vertex_only, bmd->lim_flags & MOD_BEVEL_WEIGHT, do_clamp,
dvert, vgroup, mat, loop_slide); 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 && BLI_assert(bm->vtoolflagpool == NULL &&
bm->etoolflagpool == NULL && bm->etoolflagpool == NULL &&

2
source/blender/modifiers/intern/MOD_lattice.c
View File

@@ -124,7 +124,7 @@ static void deformVertsEM(
struct Mesh *mesh_src = mesh; struct Mesh *mesh_src = mesh;
if (!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); deformVerts(md, ctx, mesh_src, vertexCos, numVerts);

2
source/blender/modifiers/intern/MOD_skin.c
View File

@@ -1865,7 +1865,7 @@ static Mesh *base_skin(Mesh *origmesh,
if (!bm) if (!bm)
return NULL; 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); BM_mesh_free(bm);
result->runtime.cd_dirty_vert |= CD_MASK_NORMAL; result->runtime.cd_dirty_vert |= CD_MASK_NORMAL;

2
source/blender/modifiers/intern/MOD_wireframe.c
View File

@@ -103,7 +103,7 @@ static Mesh *WireframeModifier_do(WireframeModifierData *wmd, Object *ob, Mesh *
MAX2(ob->totcol - 1, 0), MAX2(ob->totcol - 1, 0),
false); false);
result = BKE_bmesh_to_mesh(bm, &(struct BMeshToMeshParams){0}); result = BKE_bmesh_to_mesh_nomain(bm, &(struct BMeshToMeshParams){0});
BM_mesh_free(bm); BM_mesh_free(bm);
result->runtime.cd_dirty_vert |= CD_MASK_NORMAL; result->runtime.cd_dirty_vert |= CD_MASK_NORMAL;