[Bf-blender-cvs] [79ca13a7456] blender2.8: Cleanup: naming
Campbell Barton
noreply at git.blender.org
Tue Oct 9 07:10:27 CEST 2018
Commit: 79ca13a7456e34ab961ae2fd46c96b9bc6c03f91
Author: Campbell Barton
Date: Tue Oct 9 16:09:59 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB79ca13a7456e34ab961ae2fd46c96b9bc6c03f91
Cleanup: naming
Use BKE_mesh_* prefix for mesh module.
===================================================================
M source/blender/alembic/intern/abc_mesh.cc
M source/blender/blenkernel/BKE_mesh.h
M source/blender/blenkernel/intern/DerivedMesh.c
M source/blender/blenkernel/intern/mesh.c
M source/blender/blenkernel/intern/modifier.c
M source/blender/modifiers/intern/MOD_bevel.c
M source/blender/modifiers/intern/MOD_boolean.c
M source/blender/modifiers/intern/MOD_decimate.c
M source/blender/modifiers/intern/MOD_edgesplit.c
M source/blender/modifiers/intern/MOD_particlesystem.c
M source/blender/modifiers/intern/MOD_shrinkwrap.c
M source/blender/modifiers/intern/MOD_skin.c
M source/blender/modifiers/intern/MOD_smooth.c
M source/blender/modifiers/intern/MOD_triangulate.c
M source/blender/modifiers/intern/MOD_util.c
M source/blender/modifiers/intern/MOD_warp.c
M source/blender/modifiers/intern/MOD_wireframe.c
===================================================================
diff --git a/source/blender/alembic/intern/abc_mesh.cc b/source/blender/alembic/intern/abc_mesh.cc
index 2b739837239..556bbd3be76 100644
--- a/source/blender/alembic/intern/abc_mesh.cc
+++ b/source/blender/alembic/intern/abc_mesh.cc
@@ -547,7 +547,7 @@ Mesh *AbcMeshWriter::getFinalMesh(bool &r_needsfree)
BM_mesh_triangulate(bm, quad_method, ngon_method, tag_only, NULL, NULL, NULL);
struct BMeshToMeshParams bmmp = {0};
- Mesh *result = BKE_bmesh_to_mesh_nomain(bm, &bmmp);
+ Mesh *result = BKE_mesh_from_bmesh_nomain(bm, &bmmp);
BM_mesh_free(bm);
mesh = result;
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h
index aaf0a620890..99815149ad5 100644
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@ -90,7 +90,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_nomain(struct BMesh *bm, const struct BMeshToMeshParams *params);
+struct Mesh *BKE_mesh_from_bmesh_nomain(struct BMesh *bm, const struct BMeshToMeshParams *params);
struct Mesh *BKE_mesh_from_editmesh_with_coords_thin_wrap(
struct BMEditMesh *em, CustomDataMask data_mask, float (*vertexCos)[3]);
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 72823e7b1b4..4fb99008e8c 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -1201,7 +1201,7 @@ static Mesh *create_orco_mesh(Object *ob, Mesh *me, BMEditMesh *em, int layer)
int free;
if (em) {
- mesh = BKE_bmesh_to_mesh_nomain(em->bm, &(struct BMeshToMeshParams){0});
+ mesh = BKE_mesh_from_bmesh_nomain(em->bm, &(struct BMeshToMeshParams){0});
}
else {
mesh = BKE_mesh_copy_for_eval(me, true);
@@ -2015,7 +2015,7 @@ static void editbmesh_calc_modifiers(
}
else {
- me = BKE_bmesh_to_mesh_nomain(em->bm, &(struct BMeshToMeshParams){0});
+ me = BKE_mesh_from_bmesh_nomain(em->bm, &(struct BMeshToMeshParams){0});
ASSERT_IS_VALID_MESH(me);
if (deformedVerts) {
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index e3fc2926cfc..7ba249ade18 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -748,7 +748,7 @@ BMesh *BKE_mesh_to_bmesh(
});
}
-Mesh *BKE_bmesh_to_mesh_nomain(BMesh *bm, const struct BMeshToMeshParams *params)
+Mesh *BKE_mesh_from_bmesh_nomain(BMesh *bm, const struct BMeshToMeshParams *params)
{
BLI_assert(params->calc_object_remap == false);
Mesh *mesh = BKE_id_new_nomain(ID_ME, NULL);
@@ -762,7 +762,7 @@ Mesh *BKE_bmesh_to_mesh_nomain(BMesh *bm, const struct BMeshToMeshParams *params
Mesh *BKE_mesh_from_editmesh_with_coords_thin_wrap(
BMEditMesh *em, CustomDataMask data_mask, float (*vertexCos)[3])
{
- Mesh *me = BKE_bmesh_to_mesh_nomain(
+ Mesh *me = BKE_mesh_from_bmesh_nomain(
em->bm,
&(struct BMeshToMeshParams){
.cd_mask_extra = data_mask,
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 2a7c900379b..cec49080736 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -1094,7 +1094,7 @@ Mesh *BKE_modifier_get_evaluated_mesh_from_evaluated_object(Object *ob_eval, boo
/* Note: currently we have no equivalent to derived cagemesh or even final dm in BMEditMesh...
* This is TODO in core depsgraph/modifier stack code still. */
BMEditMesh *em = BKE_editmesh_from_object(ob_eval);
- me = BKE_bmesh_to_mesh_nomain(em->bm, &(struct BMeshToMeshParams){0});
+ me = BKE_mesh_from_bmesh_nomain(em->bm, &(struct BMeshToMeshParams){0});
*r_free_mesh = true;
}
else {
diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c
index a961208755d..149e37e543a 100644
--- a/source/blender/modifiers/intern/MOD_bevel.c
+++ b/source/blender/modifiers/intern/MOD_bevel.c
@@ -448,7 +448,7 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes
if (set_wn_strength)
bevel_set_weighted_normal_face_strength(bm, scene);
- result = BKE_bmesh_to_mesh_nomain(bm, &(struct BMeshToMeshParams){0});
+ result = BKE_mesh_from_bmesh_nomain(bm, &(struct BMeshToMeshParams){0});
BLI_assert(bm->vtoolflagpool == NULL &&
bm->etoolflagpool == NULL &&
diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c
index db1078fa677..a1bb788583e 100644
--- a/source/blender/modifiers/intern/MOD_boolean.c
+++ b/source/blender/modifiers/intern/MOD_boolean.c
@@ -317,7 +317,7 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes
MEM_freeN(looptris);
}
- result = BKE_bmesh_to_mesh_nomain(bm, &((struct BMeshToMeshParams){0}));
+ result = BKE_mesh_from_bmesh_nomain(bm, &((struct BMeshToMeshParams){0}));
BM_mesh_free(bm);
diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c
index 9e35746c0a3..49429b26fe4 100644
--- a/source/blender/modifiers/intern/MOD_decimate.c
+++ b/source/blender/modifiers/intern/MOD_decimate.c
@@ -186,7 +186,7 @@ static Mesh *applyModifier(
/* update for display only */
dmd->face_count = bm->totface;
- result = BKE_bmesh_to_mesh_nomain(bm, &((struct BMeshToMeshParams){0}));
+ result = BKE_mesh_from_bmesh_nomain(bm, &((struct BMeshToMeshParams){0}));
BLI_assert(bm->vtoolflagpool == NULL &&
bm->etoolflagpool == NULL &&
bm->ftoolflagpool == NULL); /* make sure we never alloc'd these */
diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c b/source/blender/modifiers/intern/MOD_edgesplit.c
index a8d4d55c5d3..8c23ce7e34c 100644
--- a/source/blender/modifiers/intern/MOD_edgesplit.c
+++ b/source/blender/modifiers/intern/MOD_edgesplit.c
@@ -106,7 +106,7 @@ static Mesh *doEdgeSplit(Mesh *mesh, EdgeSplitModifierData *emd, const ModifierE
/* BM_mesh_validate(bm); */ /* for troubleshooting */
- result = BKE_bmesh_to_mesh_nomain(bm, &((struct BMeshToMeshParams){0}));
+ result = BKE_mesh_from_bmesh_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_particlesystem.c b/source/blender/modifiers/intern/MOD_particlesystem.c
index aeb2bfb2467..d92f2ec8ffb 100644
--- a/source/blender/modifiers/intern/MOD_particlesystem.c
+++ b/source/blender/modifiers/intern/MOD_particlesystem.c
@@ -162,7 +162,7 @@ static void deformVerts(
if (edit_btmesh) {
/* In edit mode get directly from the edit mesh. */
- psmd->mesh_original = BKE_bmesh_to_mesh_nomain(edit_btmesh->bm, &(struct BMeshToMeshParams){0});
+ psmd->mesh_original = BKE_mesh_from_bmesh_nomain(edit_btmesh->bm, &(struct BMeshToMeshParams){0});
}
else {
/* Otherwise get regular mesh. */
diff --git a/source/blender/modifiers/intern/MOD_shrinkwrap.c b/source/blender/modifiers/intern/MOD_shrinkwrap.c
index 94bd9ae2353..196cdb63ba1 100644
--- a/source/blender/modifiers/intern/MOD_shrinkwrap.c
+++ b/source/blender/modifiers/intern/MOD_shrinkwrap.c
@@ -126,7 +126,7 @@ static void deformVertsEM(
Mesh *mesh_src = mesh;
if (mesh_src == NULL) {
- mesh_src = BKE_bmesh_to_mesh_nomain(editData->bm, &(struct BMeshToMeshParams){0});
+ mesh_src = BKE_mesh_from_bmesh_nomain(editData->bm, &(struct BMeshToMeshParams){0});
}
BLI_assert(mesh_src->totvert == numVerts);
diff --git a/source/blender/modifiers/intern/MOD_skin.c b/source/blender/modifiers/intern/MOD_skin.c
index 31d556292f8..4b8759d2f4d 100644
--- a/source/blender/modifiers/intern/MOD_skin.c
+++ b/source/blender/modifiers/intern/MOD_skin.c
@@ -1880,7 +1880,7 @@ static Mesh *base_skin(Mesh *origmesh,
if (!bm)
return NULL;
- result = BKE_bmesh_to_mesh_nomain(bm, &(struct BMeshToMeshParams){0});
+ result = BKE_mesh_from_bmesh_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_smooth.c b/source/blender/modifiers/intern/MOD_smooth.c
index 29508524f9c..916f862b29f 100644
--- a/source/blender/modifiers/intern/MOD_smooth.c
+++ b/source/blender/modifiers/intern/MOD_smooth.c
@@ -232,7 +232,7 @@ static void deformVertsEM(
Mesh *mesh_src = mesh;
if (mesh_src == NULL) {
- mesh_src = BKE_bmesh_to_mesh_nomain(editData->bm, &(struct BMeshToMeshParams){0});
+ mesh_src = BKE_mesh_from_bmesh_nomain(editData->bm, &(struct BMeshToMeshParams){0});
}
BLI_assert(mesh_src->totvert == numVerts);
diff --git a/source/blender/modifiers/intern/MOD_triangulate.c b/source/blender/modifiers/intern/MOD_triangulate.c
index d845246e1a1..abbd36701e2 100644
--- a/source/blender/modifiers/intern/MOD_triangulate.c
+++ b/source/blender/modifiers/intern/MOD_triangulate.c
@@ -53,7 +53,7 @@ static Mesh *triangulate_mesh(Mesh *mesh, const int quad_method, const int ngon_
BM_mesh_triangulate(bm, quad_method, ngon_method, false, NULL, NULL, NULL);
- result = BKE_bmesh_to_mesh_nomain(bm, &((struct BMeshToMeshParams){0}));
+ result = BKE_mesh_from_bmesh_nomain(bm, &((struct BMeshToMeshParams){0}));
BM_mesh_free(bm);
total_edges = result->totedge;
diff --git a/source/blender/modifiers/intern/MOD_util.c b/source/blender/modifiers/intern/MOD_util.c
index 466e0b89a8a..0b6a3bc4b99 100644
--- a/source/blender/modifiers/intern/MOD_util.c
+++ b/source/blender/modifiers/intern/MOD_util.c
@@ -177,7 +177,7 @@ Mesh *MOD_get_mesh_eval(
}
else if (ob->type == OB_MESH) {
if (em) {
- mesh = BKE_bmesh_to_mesh_nomain(em->bm, &(struct BMeshToMeshParams){0});
+ mesh = BKE_mesh_from_bmesh_nomain(em->bm, &(struct BMeshToMeshParams){0});
}
else {
/* TODO(sybren): after modifier conversion of DM to Mesh is done, check whether
diff --git a/source/blender/modifiers/intern/MOD_warp.c b/source/blender/modifiers/intern/MOD_warp.c
index a8f305bcc13..b8916344576 100644
--- a/source/blender/modif
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list