Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/bmesh/intern/bmesh_operator_api_inline.h
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff)
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_operator_api_inline.h')
-rw-r--r--source/blender/bmesh/intern/bmesh_operator_api_inline.h230
1 files changed, 122 insertions, 108 deletions
diff --git a/source/blender/bmesh/intern/bmesh_operator_api_inline.h b/source/blender/bmesh/intern/bmesh_operator_api_inline.h
index 78e75cf3d30..2bda2d121c2 100644
--- a/source/blender/bmesh/intern/bmesh_operator_api_inline.h
+++ b/source/blender/bmesh/intern/bmesh_operator_api_inline.h
@@ -32,195 +32,209 @@
* ghash or a mapping slot to do it. */
/* flags 15 and 16 (1 << 14 and 1 << 15) are reserved for bmesh api use */
-ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2)
-BLI_INLINE short _bmo_elem_flag_test(BMesh *bm, const BMFlagLayer *oflags, const short oflag)
+ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2) BLI_INLINE
+ short _bmo_elem_flag_test(BMesh *bm, const BMFlagLayer *oflags, const short oflag)
{
- BLI_assert(bm->use_toolflags);
- return oflags[bm->toolflag_index].f & oflag;
+ BLI_assert(bm->use_toolflags);
+ return oflags[bm->toolflag_index].f & oflag;
}
-ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2)
-BLI_INLINE bool _bmo_elem_flag_test_bool(BMesh *bm, const BMFlagLayer *oflags, const short oflag)
+ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2) BLI_INLINE
+ bool _bmo_elem_flag_test_bool(BMesh *bm, const BMFlagLayer *oflags, const short oflag)
{
- BLI_assert(bm->use_toolflags);
- return (oflags[bm->toolflag_index].f & oflag) != 0;
+ BLI_assert(bm->use_toolflags);
+ return (oflags[bm->toolflag_index].f & oflag) != 0;
}
ATTR_NONNULL(1, 2)
BLI_INLINE void _bmo_elem_flag_enable(BMesh *bm, BMFlagLayer *oflags, const short oflag)
{
- BLI_assert(bm->use_toolflags);
- oflags[bm->toolflag_index].f |= oflag;
+ BLI_assert(bm->use_toolflags);
+ oflags[bm->toolflag_index].f |= oflag;
}
ATTR_NONNULL(1, 2)
BLI_INLINE void _bmo_elem_flag_disable(BMesh *bm, BMFlagLayer *oflags, const short oflag)
{
- BLI_assert(bm->use_toolflags);
- oflags[bm->toolflag_index].f &= (short)~oflag;
+ BLI_assert(bm->use_toolflags);
+ oflags[bm->toolflag_index].f &= (short)~oflag;
}
ATTR_NONNULL(1, 2)
BLI_INLINE void _bmo_elem_flag_set(BMesh *bm, BMFlagLayer *oflags, const short oflag, int val)
{
- BLI_assert(bm->use_toolflags);
- if (val) { oflags[bm->toolflag_index].f |= oflag; }
- else { oflags[bm->toolflag_index].f &= (short)~oflag; }
+ BLI_assert(bm->use_toolflags);
+ if (val) {
+ oflags[bm->toolflag_index].f |= oflag;
+ }
+ else {
+ oflags[bm->toolflag_index].f &= (short)~oflag;
+ }
}
ATTR_NONNULL(1, 2)
BLI_INLINE void _bmo_elem_flag_toggle(BMesh *bm, BMFlagLayer *oflags, const short oflag)
{
- BLI_assert(bm->use_toolflags);
- oflags[bm->toolflag_index].f ^= oflag;
+ BLI_assert(bm->use_toolflags);
+ oflags[bm->toolflag_index].f ^= oflag;
}
ATTR_NONNULL(1, 2)
-BLI_INLINE void BMO_slot_map_int_insert(
- BMOperator *op, BMOpSlot *slot,
- void *element, const int val)
+BLI_INLINE void BMO_slot_map_int_insert(BMOperator *op,
+ BMOpSlot *slot,
+ void *element,
+ const int val)
{
- union { void *ptr; int val; } t = {NULL};
- BLI_assert(slot->slot_subtype.map == BMO_OP_SLOT_SUBTYPE_MAP_INT);
- BMO_slot_map_insert(op, slot, element, ((void)(t.val = val), t.ptr));
+ union {
+ void *ptr;
+ int val;
+ } t = {NULL};
+ BLI_assert(slot->slot_subtype.map == BMO_OP_SLOT_SUBTYPE_MAP_INT);
+ BMO_slot_map_insert(op, slot, element, ((void)(t.val = val), t.ptr));
}
ATTR_NONNULL(1, 2)
-BLI_INLINE void BMO_slot_map_bool_insert(
- BMOperator *op, BMOpSlot *slot,
- void *element, const bool val)
+BLI_INLINE void BMO_slot_map_bool_insert(BMOperator *op,
+ BMOpSlot *slot,
+ void *element,
+ const bool val)
{
- union { void *ptr; bool val; } t = {NULL};
- BLI_assert(slot->slot_subtype.map == BMO_OP_SLOT_SUBTYPE_MAP_BOOL);
- BMO_slot_map_insert(op, slot, element, ((void)(t.val = val), t.ptr));
+ union {
+ void *ptr;
+ bool val;
+ } t = {NULL};
+ BLI_assert(slot->slot_subtype.map == BMO_OP_SLOT_SUBTYPE_MAP_BOOL);
+ BMO_slot_map_insert(op, slot, element, ((void)(t.val = val), t.ptr));
}
ATTR_NONNULL(1, 2)
-BLI_INLINE void BMO_slot_map_float_insert(
- BMOperator *op, BMOpSlot *slot,
- void *element, const float val)
+BLI_INLINE void BMO_slot_map_float_insert(BMOperator *op,
+ BMOpSlot *slot,
+ void *element,
+ const float val)
{
- union { void *ptr; float val; } t = {NULL};
- BLI_assert(slot->slot_subtype.map == BMO_OP_SLOT_SUBTYPE_MAP_FLT);
- BMO_slot_map_insert(op, slot, element, ((void)(t.val = val), t.ptr));
+ union {
+ void *ptr;
+ float val;
+ } t = {NULL};
+ BLI_assert(slot->slot_subtype.map == BMO_OP_SLOT_SUBTYPE_MAP_FLT);
+ BMO_slot_map_insert(op, slot, element, ((void)(t.val = val), t.ptr));
}
-
/* pointer versions of BMO_slot_map_float_get and BMO_slot_map_float_insert.
*
* do NOT use these for non-operator-api-allocated memory! instead
* use BMO_slot_map_data_get and BMO_slot_map_insert, which copies the data. */
ATTR_NONNULL(1, 2)
-BLI_INLINE void BMO_slot_map_ptr_insert(
- BMOperator *op, BMOpSlot *slot,
- const void *element, void *val)
+BLI_INLINE void BMO_slot_map_ptr_insert(BMOperator *op,
+ BMOpSlot *slot,
+ const void *element,
+ void *val)
{
- BLI_assert(slot->slot_subtype.map == BMO_OP_SLOT_SUBTYPE_MAP_INTERNAL);
- BMO_slot_map_insert(op, slot, element, val);
+ BLI_assert(slot->slot_subtype.map == BMO_OP_SLOT_SUBTYPE_MAP_INTERNAL);
+ BMO_slot_map_insert(op, slot, element, val);
}
ATTR_NONNULL(1, 2)
-BLI_INLINE void BMO_slot_map_elem_insert(
- BMOperator *op, BMOpSlot *slot,
- const void *element, void *val)
+BLI_INLINE void BMO_slot_map_elem_insert(BMOperator *op,
+ BMOpSlot *slot,
+ const void *element,
+ void *val)
{
- BLI_assert(slot->slot_subtype.map == BMO_OP_SLOT_SUBTYPE_MAP_ELEM);
- BMO_slot_map_insert(op, slot, element, val);
+ BLI_assert(slot->slot_subtype.map == BMO_OP_SLOT_SUBTYPE_MAP_ELEM);
+ BMO_slot_map_insert(op, slot, element, val);
}
-
/* no values */
ATTR_NONNULL(1, 2)
-BLI_INLINE void BMO_slot_map_empty_insert(
- BMOperator *op, BMOpSlot *slot,
- const void *element)
+BLI_INLINE void BMO_slot_map_empty_insert(BMOperator *op, BMOpSlot *slot, const void *element)
{
- BLI_assert(slot->slot_subtype.map == BMO_OP_SLOT_SUBTYPE_MAP_EMPTY);
- BMO_slot_map_insert(op, slot, element, NULL);
+ BLI_assert(slot->slot_subtype.map == BMO_OP_SLOT_SUBTYPE_MAP_EMPTY);
+ BMO_slot_map_insert(op, slot, element, NULL);
}
-ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1)
-BLI_INLINE bool BMO_slot_map_contains(BMOpSlot *slot, const void *element)
+ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1) BLI_INLINE
+ bool BMO_slot_map_contains(BMOpSlot *slot, const void *element)
{
- BLI_assert(slot->slot_type == BMO_OP_SLOT_MAPPING);
- return BLI_ghash_haskey(slot->data.ghash, element);
+ BLI_assert(slot->slot_type == BMO_OP_SLOT_MAPPING);
+ return BLI_ghash_haskey(slot->data.ghash, element);
}
-ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1)
-BLI_INLINE void **BMO_slot_map_data_get(BMOpSlot *slot, const void *element)
+ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1) BLI_INLINE
+ void **BMO_slot_map_data_get(BMOpSlot *slot, const void *element)
{
- return BLI_ghash_lookup_p(slot->data.ghash, element);
+ return BLI_ghash_lookup_p(slot->data.ghash, element);
}
-ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1)
-BLI_INLINE float BMO_slot_map_float_get(BMOpSlot *slot, const void *element)
+ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1) BLI_INLINE
+ float BMO_slot_map_float_get(BMOpSlot *slot, const void *element)
{
- void **data;
- BLI_assert(slot->slot_subtype.map == BMO_OP_SLOT_SUBTYPE_MAP_FLT);
+ void **data;
+ BLI_assert(slot->slot_subtype.map == BMO_OP_SLOT_SUBTYPE_MAP_FLT);
- data = BMO_slot_map_data_get(slot, element);
- if (data) {
- return *(float *)data;
- }
- else {
- return 0.0f;
- }
+ data = BMO_slot_map_data_get(slot, element);
+ if (data) {
+ return *(float *)data;
+ }
+ else {
+ return 0.0f;
+ }
}
-ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1)
-BLI_INLINE int BMO_slot_map_int_get(BMOpSlot *slot, const void *element)
+ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1) BLI_INLINE
+ int BMO_slot_map_int_get(BMOpSlot *slot, const void *element)
{
- void **data;
- BLI_assert(slot->slot_subtype.map == BMO_OP_SLOT_SUBTYPE_MAP_INT);
+ void **data;
+ BLI_assert(slot->slot_subtype.map == BMO_OP_SLOT_SUBTYPE_MAP_INT);
- data = BMO_slot_map_data_get(slot, element);
- if (data) {
- return *(int *)data;
- }
- else {
- return 0;
- }
+ data = BMO_slot_map_data_get(slot, element);
+ if (data) {
+ return *(int *)data;
+ }
+ else {
+ return 0;
+ }
}
-ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1)
-BLI_INLINE bool BMO_slot_map_bool_get(BMOpSlot *slot, const void *element)
+ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1) BLI_INLINE
+ bool BMO_slot_map_bool_get(BMOpSlot *slot, const void *element)
{
- void **data;
- BLI_assert(slot->slot_subtype.map == BMO_OP_SLOT_SUBTYPE_MAP_BOOL);
+ void **data;
+ BLI_assert(slot->slot_subtype.map == BMO_OP_SLOT_SUBTYPE_MAP_BOOL);
- data = BMO_slot_map_data_get(slot, element);
- if (data) {
- return *(bool *)data;
- }
- else {
- return false;
- }
+ data = BMO_slot_map_data_get(slot, element);
+ if (data) {
+ return *(bool *)data;
+ }
+ else {
+ return false;
+ }
}
-ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1)
-BLI_INLINE void *BMO_slot_map_ptr_get(BMOpSlot *slot, const void *element)
+ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1) BLI_INLINE
+ void *BMO_slot_map_ptr_get(BMOpSlot *slot, const void *element)
{
- void **val = BMO_slot_map_data_get(slot, element);
- BLI_assert(slot->slot_subtype.map == BMO_OP_SLOT_SUBTYPE_MAP_INTERNAL);
- if (val) {
- return *val;
- }
+ void **val = BMO_slot_map_data_get(slot, element);
+ BLI_assert(slot->slot_subtype.map == BMO_OP_SLOT_SUBTYPE_MAP_INTERNAL);
+ if (val) {
+ return *val;
+ }
- return NULL;
+ return NULL;
}
-ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1)
-BLI_INLINE void *BMO_slot_map_elem_get(BMOpSlot *slot, const void *element)
+ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1) BLI_INLINE
+ void *BMO_slot_map_elem_get(BMOpSlot *slot, const void *element)
{
- void **val = (void **) BMO_slot_map_data_get(slot, element);
- BLI_assert(slot->slot_subtype.map == BMO_OP_SLOT_SUBTYPE_MAP_ELEM);
- if (val) {
- return *val;
- }
+ void **val = (void **)BMO_slot_map_data_get(slot, element);
+ BLI_assert(slot->slot_subtype.map == BMO_OP_SLOT_SUBTYPE_MAP_ELEM);
+ if (val) {
+ return *val;
+ }
- return NULL;
+ return NULL;
}
#endif /* __BMESH_OPERATOR_API_INLINE_H__ */