blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Cleanup: Use LISTBASE_FOREACH macro

This commit is contained in:
Hans Goudey 2021-01-07 21:24:46 -06:00
parent 15bb8f9f93
commit 09ea339a6c
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/editors/object/object_edit.c
View File

@ -504,7 +504,7 @@ static bool mesh_needs_keyindex(Main *bmain, const Mesh *me)
return false; /* will be added */
}
for (const Object *ob = bmain->objects.first; ob; ob = ob->id.next) {
LISTBASE_FOREACH (const Object *, ob, &bmain->objects) {
if ((ob->parent) && (ob->parent->data == me) && ELEM(ob->partype, PARVERT1, PARVERT3)) {
return true;
}
@ -650,12 +650,10 @@ bool ED_object_editmode_exit_ex(Main *bmain, Scene *scene, Object *obedit, int f
/* freedata only 0 now on file saves and render */
if (freedata) {
ListBase pidlist;
PTCacheID *pid;
/* flag object caches as outdated */
ListBase pidlist;
BKE_ptcache_ids_from_object(&pidlist, obedit, scene, 0);
for (pid = pidlist.first; pid; pid = pid->next) {
LISTBASE_FOREACH (PTCacheID *, pid, &pidlist) {
/* particles don't need reset on geometry change */
if (pid->type != PTCACHE_TYPE_PARTICLES) {
pid->cache->flag |= PTCACHE_OUTDATED;
@ -1398,7 +1396,7 @@ static int shade_smooth_exec(bContext *C, wmOperator *op)
CTX_data_selected_editable_objects(C, &ctx_objects);
}
for (CollectionPointerLink *ctx_ob = ctx_objects.first; ctx_ob; ctx_ob = ctx_ob->next) {
LISTBASE_FOREACH (CollectionPointerLink *, ctx_ob, &ctx_objects) {
Object *ob = ctx_ob->ptr.data;
ID *data = ob->data;
if (data != NULL) {
@ -1406,7 +1404,7 @@ static int shade_smooth_exec(bContext *C, wmOperator *op)
}
}
for (CollectionPointerLink *ctx_ob = ctx_objects.first; ctx_ob; ctx_ob = ctx_ob->next) {
LISTBASE_FOREACH (CollectionPointerLink *, ctx_ob, &ctx_objects) {
/* Always un-tag all object data-blocks irrespective of our ability to operate on them. */
Object *ob = ctx_ob->ptr.data;
ID *data = ob->data;
@ -1817,11 +1815,9 @@ struct MoveToCollectionData {
static int move_to_collection_menus_create(wmOperator *op, MoveToCollectionData *menu)
{
int index = menu->index;
for (CollectionChild *child = menu->collection->children.first; child != NULL;
child = child->next) {
LISTBASE_FOREACH (CollectionChild *, child, &menu->collection->children) {
Collection *collection = child->collection;
MoveToCollectionData *submenu = MEM_callocN(sizeof(MoveToCollectionData),
"MoveToCollectionData submenu - expected memleak");
MoveToCollectionData *submenu = MEM_callocN(sizeof(MoveToCollectionData), __func__);
BLI_addtail(&menu->submenus, submenu);
submenu->collection = collection;
submenu->index = ++index;
@ -1833,8 +1829,7 @@ static int move_to_collection_menus_create(wmOperator *op, MoveToCollectionData
static void move_to_collection_menus_free_recursive(MoveToCollectionData *menu)
{
for (MoveToCollectionData *submenu = menu->submenus.first; submenu != NULL;
submenu = submenu->next) {
LISTBASE_FOREACH (MoveToCollectionData *, submenu, &menu->submenus) {
move_to_collection_menus_free_recursive(submenu);
}
BLI_freelistN(&menu->submenus);
@ -1873,8 +1868,7 @@ static void move_to_collection_menu_create(bContext *C, uiLayout *layout, void *
UI_icon_color_from_collection(menu->collection);
uiItemIntO(layout, name, icon, menu->ot->idname, "collection_index", menu->index);
for (MoveToCollectionData *submenu = menu->submenus.first; submenu != NULL;
submenu = submenu->next) {
LISTBASE_FOREACH (MoveToCollectionData *, submenu, &menu->submenus) {
move_to_collection_menus_items(layout, submenu);
}
}