diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-10-09 08:09:59 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-10-09 08:09:59 +0300 |
commit | 79ca13a7456e34ab961ae2fd46c96b9bc6c03f91 (patch) | |
tree | f09218a19b5657f9045d8e46c99c7458ef624b48 /source/blender/blenkernel | |
parent | 72e90c5db30d830b27a42f4d3689f453e092c267 (diff) |
Cleanup: naming
Use BKE_mesh_* prefix for mesh module.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_mesh.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/modifier.c | 2 |
4 files changed, 6 insertions, 6 deletions
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 { |