diff options
Diffstat (limited to 'source/blender/editors/interface')
4 files changed, 9 insertions, 8 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index f85c53c7330..db2b804363c 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -252,7 +252,7 @@ void ui_bounds_block(uiBlock *block) uiBut *bt; int xof; - if (block->buttons.first == NULL) { + if (BLI_listbase_is_empty(&block->buttons)) { if (block->panel) { block->rect.xmin = 0.0; block->rect.xmax = block->panel->sizex; block->rect.ymin = 0.0; block->rect.ymax = block->panel->sizey; @@ -3535,7 +3535,7 @@ void uiBlockFlipOrder(uiBlock *block) } /* also flip order in block itself, for example for arrowkey */ - lb.first = lb.last = NULL; + BLI_listbase_clear(&lb); but = block->buttons.first; while (but) { next = but->next; diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index cf930d635a7..b5d7bbd022a 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -542,7 +542,7 @@ static void ui_apply_but_funcs_after(bContext *C) /* copy to avoid recursive calls */ funcs = UIAfterFuncs; - UIAfterFuncs.first = UIAfterFuncs.last = NULL; + BLI_listbase_clear(&UIAfterFuncs); for (afterf = funcs.first; afterf; afterf = after.next) { after = *afterf; /* copy to avoid memleak on exit() */ @@ -7906,8 +7906,9 @@ static int ui_handler_region(bContext *C, const wmEvent *event, void *UNUSED(use ar = CTX_wm_region(C); retval = WM_UI_HANDLER_CONTINUE; - if (ar == NULL) return retval; - if (ar->uiblocks.first == NULL) return retval; + if (ar == NULL || BLI_listbase_is_empty(&ar->uiblocks)) { + return retval; + } /* either handle events for already activated button or try to activate */ but = ui_but_find_activated(ar); diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index 729cbc23efd..d7056d898cb 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -709,7 +709,7 @@ static void init_iconfile_list(struct ListBase *list) int totfile, i, index = 1; const char *icondir; - list->first = list->last = NULL; + BLI_listbase_clear(list); icondir = BLI_get_folder(BLENDER_DATAFILES, "icons"); if (icondir == NULL) diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index e10baa35d0d..a2cbd0723c9 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -2703,7 +2703,7 @@ static void ui_item_estimate(uiItem *item) for (subitem = litem->items.first; subitem; subitem = subitem->next) ui_item_estimate(subitem); - if (litem->items.first == NULL) + if (BLI_listbase_is_empty(&litem->items)) return; if (litem->scale[0] != 0.0f || litem->scale[1] != 0.0f) @@ -2793,7 +2793,7 @@ static void ui_item_layout(uiItem *item) if (item->type != ITEM_BUTTON) { uiLayout *litem = (uiLayout *)item; - if (litem->items.first == NULL) + if (BLI_listbase_is_empty(&litem->items)) return; if (litem->align) |