[Bf-blender-cvs] [1c790555a02] master: Cleanup: Use bool for BMesh creation params

Hans Goudey noreply at git.blender.org
Tue Mar 22 15:38:22 CET 2022


Commit: 1c790555a02bfc37580465525234c68e9f09caab
Author: Hans Goudey
Date:   Tue Mar 22 09:38:12 2022 -0500
Branches: master
https://developer.blender.org/rB1c790555a02bfc37580465525234c68e9f09caab

Cleanup: Use bool for BMesh creation params

These boolean options are passed as uint, but they would be
easier to understand if using bool.

Differential Revision: https://developer.blender.org/D14405

===================================================================

M	source/blender/bmesh/intern/bmesh_mesh_convert.h

===================================================================

diff --git a/source/blender/bmesh/intern/bmesh_mesh_convert.h b/source/blender/bmesh/intern/bmesh_mesh_convert.h
index e619448d3c4..cc1ad71549d 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 {
-  uint calc_face_normal : 1;
-  uint calc_vert_normal : 1;
+  bool calc_face_normal : true;
+  bool calc_vert_normal : true;
   /* add a vertex CD_SHAPE_KEYINDEX layer */
-  uint add_key_index : 1;
+  bool add_key_index : true;
   /* set vertex coordinates from the shapekey */
-  uint use_shapekey : 1;
+  bool use_shapekey : true;
   /* 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. */
-  uint calc_object_remap : 1;
+  bool calc_object_remap : true;
   /**
    * 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.
    */
-  uint update_shapekey_indices : 1;
+  bool update_shapekey_indices : true;
   /**
    * Instead of copying the basis shape-key into the #MVert array,
    * copy the #BMVert.co directly to #MVert.co (used for reading undo data).
    */
-  uint active_shapekey_to_mvert : 1;
+  bool active_shapekey_to_mvert : true;
   struct CustomData_MeshMasks cd_mask_extra;
 };
 /**



More information about the Bf-blender-cvs mailing list