diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-01-03 14:35:29 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-01-03 14:35:29 +0400 |
commit | c5cb42f40285fca072e8378bdadf11c674b90340 (patch) | |
tree | ab3908d2f6fb62eaa7405a68aec18d9903e90f30 /source/blender/bmesh/intern/bmesh_operator_api_inline.h | |
parent | a288644b1eaef1017d21368bd04c3ee1f038ff4c (diff) |
Code Cleanup: use bool for bmesh operator boolean mapping functions
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_operator_api_inline.h')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_operator_api_inline.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/bmesh/intern/bmesh_operator_api_inline.h b/source/blender/bmesh/intern/bmesh_operator_api_inline.h index 77310d958e6..2b78b775723 100644 --- a/source/blender/bmesh/intern/bmesh_operator_api_inline.h +++ b/source/blender/bmesh/intern/bmesh_operator_api_inline.h @@ -78,11 +78,10 @@ BLI_INLINE void BMO_slot_map_int_insert(BMOperator *op, BMOpSlot *slot, } BLI_INLINE void BMO_slot_map_bool_insert(BMOperator *op, BMOpSlot *slot, - void *element, const int val) + void *element, const bool val) { - union { void *ptr; int val; } t = {NULL}; + union { void *ptr; bool val; } t = {NULL}; BLI_assert(slot->slot_subtype.map == BMO_OP_SLOT_SUBTYPE_MAP_BOOL); - BLI_assert(val == false || val == true); BMO_slot_map_insert(op, slot, element, ((t.val = val), t.ptr)); } @@ -170,7 +169,7 @@ BLI_INLINE bool BMO_slot_map_bool_get(BMOpSlot *slot, const void *element) data = BMO_slot_map_data_get(slot, element); if (data) { - return **(int **)data; + return **(bool **)data; } else { return false; |