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-20 21:40:16 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-20 21:40:16 +0300
commit2fb9c8ef125f975596b6ef9c8f021403f8279bdf (patch)
tree02633f97a682dcd4935bf9b3170dfe5841ed048a /source/blender/blenlib
parent6b9ce24338de1a33dbf41e14e85a1630b1a2b899 (diff)
Cleanup: add missing macros to clang-format
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r--source/blender/blenlib/intern/edgehash.c33
1 files changed, 11 insertions, 22 deletions
diff --git a/source/blender/blenlib/intern/edgehash.c b/source/blender/blenlib/intern/edgehash.c
index 528f206c02e..9b846dfa08d 100644
--- a/source/blender/blenlib/intern/edgehash.c
+++ b/source/blender/blenlib/intern/edgehash.c
@@ -144,8 +144,7 @@ static void edgehash_free_values(EdgeHash *eh, EdgeHashFreeFP free_value)
BLI_INLINE void edgehash_insert_index(EdgeHash *eh, Edge edge, uint entry_index)
{
- ITER_SLOTS(eh, edge, slot, index)
- {
+ ITER_SLOTS (eh, edge, slot, index) {
if (index == SLOT_EMPTY) {
eh->map[slot] = (int32_t)entry_index;
break;
@@ -182,8 +181,7 @@ BLI_INLINE bool edgehash_ensure_can_insert(EdgeHash *eh)
BLI_INLINE EdgeHashEntry *edgehash_insert(EdgeHash *eh, Edge edge, void *value)
{
- ITER_SLOTS(eh, edge, slot, index)
- {
+ ITER_SLOTS (eh, edge, slot, index) {
if (index == SLOT_EMPTY) {
return edgehash_insert_at_slot(eh, slot, edge, value);
}
@@ -198,8 +196,7 @@ BLI_INLINE EdgeHashEntry *edgehash_lookup_entry(EdgeHash *eh, uint v0, uint v1)
{
Edge edge = init_edge(v0, v1);
- ITER_SLOTS(eh, edge, slot, index)
- {
+ ITER_SLOTS (eh, edge, slot, index) {
if (EH_INDEX_HAS_EDGE(eh, index, edge)) {
return &eh->entries[index];
}
@@ -211,8 +208,7 @@ BLI_INLINE EdgeHashEntry *edgehash_lookup_entry(EdgeHash *eh, uint v0, uint v1)
BLI_INLINE void edgehash_change_index(EdgeHash *eh, Edge edge, int new_index)
{
- ITER_SLOTS(eh, edge, slot, index)
- {
+ ITER_SLOTS (eh, edge, slot, index) {
if (EH_INDEX_HAS_EDGE(eh, index, edge)) {
eh->map[slot] = new_index;
break;
@@ -293,8 +289,7 @@ bool BLI_edgehash_reinsert(EdgeHash *eh, uint v0, uint v1, void *value)
{
Edge edge = init_edge(v0, v1);
- ITER_SLOTS(eh, edge, slot, index)
- {
+ ITER_SLOTS (eh, edge, slot, index) {
if (EH_INDEX_HAS_EDGE(eh, index, edge)) {
eh->entries[index].value = value;
return false;
@@ -360,8 +355,7 @@ bool BLI_edgehash_ensure_p(EdgeHash *eh, uint v0, uint v1, void ***r_value)
{
Edge edge = init_edge(v0, v1);
- ITER_SLOTS(eh, edge, slot, index)
- {
+ ITER_SLOTS (eh, edge, slot, index) {
if (EH_INDEX_HAS_EDGE(eh, index, edge)) {
*r_value = &eh->entries[index].value;
return true;
@@ -407,8 +401,7 @@ void *BLI_edgehash_popkey(EdgeHash *eh, uint v0, uint v1)
{
Edge edge = init_edge(v0, v1);
- ITER_SLOTS(eh, edge, slot, index)
- {
+ ITER_SLOTS (eh, edge, slot, index) {
if (EH_INDEX_HAS_EDGE(eh, index, edge)) {
void *value = eh->entries[index].value;
eh->length--;
@@ -546,8 +539,7 @@ int BLI_edgeset_len(EdgeSet *es)
static void edgeset_insert_index(EdgeSet *es, Edge edge, uint entry_index)
{
- ITER_SLOTS(es, edge, slot, index)
- {
+ ITER_SLOTS (es, edge, slot, index) {
if (index == SLOT_EMPTY) {
es->map[slot] = (int)entry_index;
break;
@@ -587,8 +579,7 @@ bool BLI_edgeset_add(EdgeSet *es, uint v0, uint v1)
edgeset_ensure_can_insert(es);
Edge edge = init_edge(v0, v1);
- ITER_SLOTS(es, edge, slot, index)
- {
+ ITER_SLOTS (es, edge, slot, index) {
if (ES_INDEX_HAS_EDGE(es, index, edge)) {
return false;
}
@@ -608,8 +599,7 @@ void BLI_edgeset_insert(EdgeSet *es, uint v0, uint v1)
edgeset_ensure_can_insert(es);
Edge edge = init_edge(v0, v1);
- ITER_SLOTS(es, edge, slot, index)
- {
+ ITER_SLOTS (es, edge, slot, index) {
if (index == SLOT_EMPTY) {
edgeset_insert_at_slot(es, slot, edge);
return;
@@ -621,8 +611,7 @@ bool BLI_edgeset_haskey(EdgeSet *es, uint v0, uint v1)
{
Edge edge = init_edge(v0, v1);
- ITER_SLOTS(es, edge, slot, index)
- {
+ ITER_SLOTS (es, edge, slot, index) {
if (ES_INDEX_HAS_EDGE(es, index, edge)) {
return true;
}