[Bf-blender-cvs] [720368e2d0f] blender2.8: Cleanup: use const mesh arg to BM_mesh_bm_from_me
Campbell Barton
noreply at git.blender.org
Tue Nov 20 03:30:43 CET 2018
Commit: 720368e2d0f29e371807e09944170bb9222000e0
Author: Campbell Barton
Date: Tue Nov 20 13:28:25 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB720368e2d0f29e371807e09944170bb9222000e0
Cleanup: use const mesh arg to BM_mesh_bm_from_me
Needed for D3966
===================================================================
M source/blender/blenkernel/BKE_mesh.h
M source/blender/blenkernel/intern/mesh.c
M source/blender/bmesh/intern/bmesh_mesh_conv.c
M source/blender/bmesh/intern/bmesh_mesh_conv.h
===================================================================
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h
index 8f0c81ce4f9..8f04bf16863 100644
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@ -83,7 +83,7 @@ extern "C" {
/* *** mesh.c *** */
struct BMesh *BKE_mesh_to_bmesh_ex(
- struct Mesh *me,
+ const struct Mesh *me,
const struct BMeshCreateParams *create_params,
const struct BMeshFromMeshParams *convert_params);
struct BMesh *BKE_mesh_to_bmesh(
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index 6a00aaf576b..4d56147bf73 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -718,7 +718,7 @@ Mesh *BKE_mesh_copy(Main *bmain, const Mesh *me)
}
BMesh *BKE_mesh_to_bmesh_ex(
- Mesh *me,
+ const Mesh *me,
const struct BMeshCreateParams *create_params,
const struct BMeshFromMeshParams *convert_params)
{
diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.c b/source/blender/bmesh/intern/bmesh_mesh_conv.c
index 9f1b032ea0b..e7ee1d45dc3 100644
--- a/source/blender/bmesh/intern/bmesh_mesh_conv.c
+++ b/source/blender/bmesh/intern/bmesh_mesh_conv.c
@@ -193,7 +193,7 @@ static BMFace *bm_face_create_from_mpoly(
* \warning This function doesn't calculate face normals.
*/
void BM_mesh_bm_from_me(
- BMesh *bm, Mesh *me,
+ BMesh *bm, const Mesh *me,
const struct BMeshFromMeshParams *params)
{
const bool is_new =
diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.h b/source/blender/bmesh/intern/bmesh_mesh_conv.h
index 0560155faa0..8f389a8cf05 100644
--- a/source/blender/bmesh/intern/bmesh_mesh_conv.h
+++ b/source/blender/bmesh/intern/bmesh_mesh_conv.h
@@ -52,7 +52,7 @@ struct BMeshFromMeshParams {
int64_t cd_mask_extra;
};
void BM_mesh_bm_from_me(
- BMesh *bm, struct Mesh *me,
+ BMesh *bm, const struct Mesh *me,
const struct BMeshFromMeshParams *params)
ATTR_NONNULL(1, 3);
More information about the Bf-blender-cvs
mailing list