diff options
author | Hans Goudey <h.goudey@me.com> | 2022-04-28 19:18:56 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2022-04-28 19:19:12 +0300 |
commit | 2d7957727c9be8af2689f1cff1ebed590238cb8e (patch) | |
tree | b5e49e62b0822fe38f7521a849421a32230669dc /source/blender/bmesh | |
parent | fbc884d2a82951c3a8c0f92993de3a0eb9907d86 (diff) |
Fix: Incorrect conversion from C bitfield syntax
Recent cleanups 9a8669ac81b99b2 and 1c790555a02bfc3
incorrectly interpereted the bitfield width syntax as a default
value. Also resolve two other compilation warnings.
Diffstat (limited to 'source/blender/bmesh')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh_convert.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/bmesh/intern/bmesh_mesh_convert.h b/source/blender/bmesh/intern/bmesh_mesh_convert.h index cc1ad71549d..e2871dc04d3 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_convert.h +++ b/source/blender/bmesh/intern/bmesh_mesh_convert.h @@ -18,12 +18,12 @@ void BM_mesh_cd_flag_apply(BMesh *bm, char cd_flag); char BM_mesh_cd_flag_from_bmesh(BMesh *bm); struct BMeshFromMeshParams { - bool calc_face_normal : true; - bool calc_vert_normal : true; + bool calc_face_normal; + bool calc_vert_normal; /* add a vertex CD_SHAPE_KEYINDEX layer */ - bool add_key_index : true; + bool add_key_index; /* set vertex coordinates from the shapekey */ - bool use_shapekey : true; + bool use_shapekey; /* define the active shape key (index + 1) */ int active_shapekey; struct CustomData_MeshMasks cd_mask_extra; @@ -43,7 +43,7 @@ void BM_mesh_bm_from_me(BMesh *bm, const struct Mesh *me, const struct BMeshFrom struct BMeshToMeshParams { /** Update object hook indices & vertex parents. */ - bool calc_object_remap : true; + bool calc_object_remap; /** * This re-assigns shape-key indices. Only do if the BMesh will have continued use * to update the mesh & shape key in the future. @@ -53,12 +53,12 @@ struct BMeshToMeshParams { * so a second flush or edit-mode exit doesn't run with indices * that have become invalid from updating the shape-key, see T71865. */ - bool update_shapekey_indices : true; + bool update_shapekey_indices; /** * Instead of copying the basis shape-key into the #MVert array, * copy the #BMVert.co directly to #MVert.co (used for reading undo data). */ - bool active_shapekey_to_mvert : true; + bool active_shapekey_to_mvert; struct CustomData_MeshMasks cd_mask_extra; }; /** |