diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-03-27 09:14:36 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-27 09:14:36 +0300 |
commit | 8d7005d7152459eb66fa33ae14eba94a0169adbb (patch) | |
tree | 78a117f4c1256dda7ce1af72f3e5b04ecbb0c4cd /source/blender/bmesh/intern/bmesh_log.c | |
parent | e26b67fa1e13b45c395878dfc667af0b4cc458cf (diff) |
Cleanup: style, use braces for bmesh
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_log.c')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_log.c | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/source/blender/bmesh/intern/bmesh_log.c b/source/blender/bmesh/intern/bmesh_log.c index 77dd6aa76ec..3b2e43b89ad 100644 --- a/source/blender/bmesh/intern/bmesh_log.c +++ b/source/blender/bmesh/intern/bmesh_log.c @@ -523,10 +523,12 @@ BMLog *BM_log_from_existing_entries_create(BMesh *bm, BMLogEntry *entry) { BMLog *log = BM_log_create(bm); - if (entry->prev) + if (entry->prev) { log->current_entry = entry; - else + } + else { log->current_entry = NULL; + } /* Let BMLog manage the entry list again */ log->entries.first = log->entries.last = entry; @@ -563,19 +565,23 @@ void BM_log_free(BMLog *log) { BMLogEntry *entry; - if (log->unused_ids) + if (log->unused_ids) { range_tree_uint_free(log->unused_ids); + } - if (log->id_to_elem) + if (log->id_to_elem) { BLI_ghash_free(log->id_to_elem, NULL, NULL); + } - if (log->elem_to_id) + if (log->elem_to_id) { BLI_ghash_free(log->elem_to_id, NULL, NULL); + } /* Clear the BMLog references within each entry, but do not free * the entries themselves */ - for (entry = log->entries.first; entry; entry = entry->next) + for (entry = log->entries.first; entry; entry = entry->next) { entry->log = NULL; + } MEM_freeN(log); } @@ -691,10 +697,12 @@ void BM_log_entry_drop(BMLogEntry *entry) if (!log) { /* Unlink */ BLI_assert(!(entry->prev && entry->next)); - if (entry->prev) + if (entry->prev) { entry->prev->next = NULL; - else if (entry->next) + } + else if (entry->next) { entry->next->prev = NULL; + } bm_log_entry_free(entry); MEM_freeN(entry); @@ -740,8 +748,9 @@ void BM_log_entry_drop(BMLogEntry *entry) BLI_assert(!"Cannot drop BMLogEntry from middle"); } - if (log->current_entry == entry) + if (log->current_entry == entry) { log->current_entry = entry->prev; + } bm_log_entry_free(entry); BLI_freelinkN(&log->entries, entry); |