From 14e96a90825942abb4e220f2d4f7c8ead52be56f Mon Sep 17 00:00:00 2001 From: Iliya Katueshenock Date: Mon, 12 Jun 2023 18:34:47 +0200 Subject: [PATCH] Cleanup: Move versioning file 2.7 to C++ 1. `NULL` -> `nullptr`. 2. Cast `void *` to `T *` by using `static_cast`. 3. Using `LISTBASE_FOREACH` instead of manual for-loops. 4. `UNUSED` -> `/* ... */` 5. `#include <....h>` -> `#include <...>` See #103343 Pull Request: https://projects.blender.org/blender/blender/pulls/108484 --- source/blender/blenloader/CMakeLists.txt | 2 +- .../{versioning_270.c => versioning_270.cc} | 521 +++++++----------- 2 files changed, 198 insertions(+), 325 deletions(-) rename source/blender/blenloader/intern/{versioning_270.c => versioning_270.cc} (76%) diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt index 87b97867bb7..91d2b8b934b 100644 --- a/source/blender/blenloader/CMakeLists.txt +++ b/source/blender/blenloader/CMakeLists.txt @@ -42,7 +42,7 @@ set(SRC intern/undofile.cc intern/versioning_250.c intern/versioning_260.c - intern/versioning_270.c + intern/versioning_270.cc intern/versioning_280.cc intern/versioning_290.cc intern/versioning_300.cc diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.cc similarity index 76% rename from source/blender/blenloader/intern/versioning_270.c rename to source/blender/blenloader/intern/versioning_270.cc index 128b4a20209..b22c50e8114 100644 --- a/source/blender/blenloader/intern/versioning_270.c +++ b/source/blender/blenloader/intern/versioning_270.cc @@ -10,7 +10,7 @@ #include "BLI_utildefines.h" /* for MinGW32 definition of NULL, could use BLI_blenlib.h instead too */ -#include +#include /* allow readfile to use deprecated functionality */ #define DNA_DEPRECATED_ALLOW @@ -86,12 +86,12 @@ static bGPDpalette *BKE_gpencil_palette_addnew(bGPdata *gpd, const char *name) bGPDpalette *palette; /* check that list is ok */ - if (gpd == NULL) { - return NULL; + if (gpd == nullptr) { + return nullptr; } /* allocate memory and add to end of list */ - palette = MEM_callocN(sizeof(bGPDpalette), "bGPDpalette"); + palette = static_cast(MEM_callocN(sizeof(bGPDpalette), "bGPDpalette")); /* add to datablock */ BLI_addtail(&gpd->palettes, palette); @@ -116,12 +116,13 @@ static bGPDpalettecolor *BKE_gpencil_palettecolor_addnew(bGPDpalette *palette, c bGPDpalettecolor *palcolor; /* check that list is ok */ - if (palette == NULL) { - return NULL; + if (palette == nullptr) { + return nullptr; } /* allocate memory and add to end of list */ - palcolor = MEM_callocN(sizeof(bGPDpalettecolor), "bGPDpalettecolor"); + palcolor = static_cast( + MEM_callocN(sizeof(bGPDpalettecolor), "bGPDpalettecolor")); /* add to datablock */ BLI_addtail(&palette->colors, palcolor); @@ -157,14 +158,12 @@ static void migrate_single_rot_stabilization_track_settings(MovieTrackingStabili stab->rot_track_legacy->flag |= TRACK_USE_2D_STAB_ROT; } } - stab->rot_track_legacy = NULL; /* this field is now ignored */ + stab->rot_track_legacy = nullptr; /* this field is now ignored */ } static void do_version_constraints_radians_degrees_270_1(ListBase *lb) { - bConstraint *con; - - for (con = lb->first; con; con = con->next) { + LISTBASE_FOREACH (bConstraint *, con, lb) { if (con->type == CONSTRAINT_TYPE_TRANSFORM) { bTransformConstraint *data = (bTransformConstraint *)con->data; const float deg_to_rad_f = DEG2RADF(1.0f); @@ -184,9 +183,7 @@ static void do_version_constraints_radians_degrees_270_1(ListBase *lb) static void do_version_constraints_radians_degrees_270_5(ListBase *lb) { - bConstraint *con; - - for (con = lb->first; con; con = con->next) { + LISTBASE_FOREACH (bConstraint *, con, lb) { if (con->type == CONSTRAINT_TYPE_TRANSFORM) { bTransformConstraint *data = (bTransformConstraint *)con->data; @@ -213,9 +210,7 @@ static void do_version_constraints_radians_degrees_270_5(ListBase *lb) static void do_version_constraints_stretch_to_limits(ListBase *lb) { - bConstraint *con; - - for (con = lb->first; con; con = con->next) { + LISTBASE_FOREACH (bConstraint *, con, lb) { if (con->type == CONSTRAINT_TYPE_STRETCHTO) { bStretchToConstraint *data = (bStretchToConstraint *)con->data; data->bulge_min = 1.0f; @@ -226,16 +221,15 @@ static void do_version_constraints_stretch_to_limits(ListBase *lb) static void do_version_action_editor_properties_region(ListBase *regionbase) { - ARegion *region; - - for (region = regionbase->first; region; region = region->next) { + LISTBASE_FOREACH (ARegion *, region, regionbase) { if (region->regiontype == RGN_TYPE_UI) { /* already exists */ return; } if (region->regiontype == RGN_TYPE_WINDOW) { /* add new region here */ - ARegion *region_new = MEM_callocN(sizeof(ARegion), "buttons for action"); + ARegion *region_new = static_cast( + MEM_callocN(sizeof(ARegion), "buttons for action")); BLI_insertlinkbefore(regionbase, region, region_new); @@ -274,23 +268,23 @@ static void anim_change_prop_name(FCurve *fcu, static void do_version_hue_sat_node(bNodeTree *ntree, bNode *node) { - if (node->storage == NULL) { + if (node->storage == nullptr) { return; } /* Convert value from old storage to new sockets. */ - NodeHueSat *nhs = node->storage; + NodeHueSat *nhs = static_cast(node->storage); bNodeSocket *hue = nodeFindSocket(node, SOCK_IN, "Hue"); bNodeSocket *saturation = nodeFindSocket(node, SOCK_IN, "Saturation"); bNodeSocket *value = nodeFindSocket(node, SOCK_IN, "Value"); - if (hue == NULL) { + if (hue == nullptr) { hue = nodeAddStaticSocket(ntree, node, SOCK_IN, SOCK_FLOAT, PROP_FACTOR, "Hue", "Hue"); } - if (saturation == NULL) { + if (saturation == nullptr) { saturation = nodeAddStaticSocket( ntree, node, SOCK_IN, SOCK_FLOAT, PROP_FACTOR, "Saturation", "Saturation"); } - if (value == NULL) { + if (value == nullptr) { value = nodeAddStaticSocket(ntree, node, SOCK_IN, SOCK_FLOAT, PROP_FACTOR, "Value", "Value"); } @@ -299,11 +293,11 @@ static void do_version_hue_sat_node(bNodeTree *ntree, bNode *node) ((bNodeSocketValueFloat *)value->default_value)->value = nhs->val; /* Take care of possible animation. */ AnimData *adt = BKE_animdata_from_id(&ntree->id); - if (adt != NULL && adt->action != NULL) { + if (adt != nullptr && adt->action != nullptr) { char node_name_esc[sizeof(node->name) * 2]; BLI_str_escape(node_name_esc, node->name, sizeof(node_name_esc)); const char *prefix = BLI_sprintfN("nodes[\"%s\"]", node_name_esc); - for (FCurve *fcu = adt->action->curves.first; fcu != NULL; fcu = fcu->next) { + LISTBASE_FOREACH (FCurve *, fcu, &adt->action->curves) { if (STRPREFIX(fcu->rna_path, prefix)) { anim_change_prop_name(fcu, prefix, "color_hue", "inputs[1].default_value"); anim_change_prop_name(fcu, prefix, "color_saturation", "inputs[2].default_value"); @@ -314,18 +308,20 @@ static void do_version_hue_sat_node(bNodeTree *ntree, bNode *node) } /* Free storage, it is no longer used. */ MEM_freeN(node->storage); - node->storage = NULL; + node->storage = nullptr; } static void do_versions_compositor_render_passes_storage(bNode *node) { int pass_index = 0; const char *sockname; - for (bNodeSocket *sock = node->outputs.first; sock && pass_index < 31; - sock = sock->next, pass_index++) + for (bNodeSocket *sock = static_cast(node->outputs.first); + sock && pass_index < 31; + sock = static_cast(sock->next), pass_index++) { - if (sock->storage == NULL) { - NodeImageLayer *sockdata = MEM_callocN(sizeof(NodeImageLayer), "node image layer"); + if (sock->storage == nullptr) { + NodeImageLayer *sockdata = static_cast( + MEM_callocN(sizeof(NodeImageLayer), "node image layer")); sock->storage = sockdata; STRNCPY(sockdata->pass_name, node_cmp_rlayers_sock_to_pass(pass_index)); @@ -362,7 +358,7 @@ static void do_versions_compositor_render_passes(bNodeTree *ntree) static char *replace_bbone_easing_rnapath(char *old_path) { - char *new_path = NULL; + char *new_path = nullptr; /* NOTE: This will break paths for any bones/custom-properties * which happen be named after the bbone property id's @@ -382,9 +378,7 @@ static char *replace_bbone_easing_rnapath(char *old_path) return old_path; } -static void do_version_bbone_easing_fcurve_fix(ID *UNUSED(id), - FCurve *fcu, - void *UNUSED(user_data)) +static void do_version_bbone_easing_fcurve_fix(ID * /*id*/, FCurve *fcu, void * /*user_data*/) { /* F-Curve's path (for bbone_in/out) */ if (fcu->rna_path) { @@ -407,7 +401,7 @@ static void do_version_bbone_easing_fcurve_fix(ID *UNUSED(id), if (fcu->modifiers.first) { LISTBASE_FOREACH (FModifier *, fcm, &fcu->modifiers) { if (fcm->type == FMODIFIER_TYPE_STEPPED) { - FMod_Stepped *data = fcm->data; + FMod_Stepped *data = static_cast(fcm->data); /* Modifier doesn't work if the modifier's copy of start/end frame are both 0 * as those were only getting written to the fcm->data copy (#52009) @@ -421,9 +415,10 @@ static void do_version_bbone_easing_fcurve_fix(ID *UNUSED(id), } } -static bool seq_update_proxy_cb(Sequence *seq, void *UNUSED(user_data)) +static bool seq_update_proxy_cb(Sequence *seq, void * /*user_data*/) { - seq->stereo3d_format = MEM_callocN(sizeof(Stereo3dFormat), "Stereo Display 3d Format"); + seq->stereo3d_format = static_cast( + MEM_callocN(sizeof(Stereo3dFormat), "Stereo Display 3d Format")); #define SEQ_USE_PROXY_CUSTOM_DIR (1 << 19) #define SEQ_USE_PROXY_CUSTOM_FILE (1 << 21) @@ -440,19 +435,19 @@ static bool seq_update_proxy_cb(Sequence *seq, void *UNUSED(user_data)) return true; } -static bool seq_update_effectdata_cb(Sequence *seq, void *UNUSED(user_data)) +static bool seq_update_effectdata_cb(Sequence *seq, void * /*user_data*/) { if (seq->type != SEQ_TYPE_TEXT) { return true; } - if (seq->effectdata == NULL) { + if (seq->effectdata == nullptr) { struct SeqEffectHandle effect_handle = SEQ_effect_handle_get(seq); effect_handle.init(seq); } - TextVars *data = seq->effectdata; + TextVars *data = static_cast(seq->effectdata); if (data->color[3] == 0.0f) { copy_v4_fl(data->color, 1.0f); data->shadow_color[3] = 1.0f; @@ -461,16 +456,13 @@ static bool seq_update_effectdata_cb(Sequence *seq, void *UNUSED(user_data)) } /* NOLINTNEXTLINE: readability-function-size */ -void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) +void blo_do_versions_270(FileData *fd, Library * /*lib*/, Main *bmain) { if (!MAIN_VERSION_ATLEAST(bmain, 270, 0)) { if (!DNA_struct_elem_find(fd->filesdna, "BevelModifierData", "float", "profile")) { - Object *ob; - - for (ob = bmain->objects.first; ob; ob = ob->id.next) { - ModifierData *md; - for (md = ob->modifiers.first; md; md = md->next) { + LISTBASE_FOREACH (Object *, ob, &bmain->objects) { + LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) { if (md->type == eModifierType_Bevel) { BevelModifierData *bmd = (BevelModifierData *)md; bmd->profile = 0.5f; @@ -483,29 +475,22 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) /* nodes don't use fixed node->id any more, clean up */ FOREACH_NODETREE_BEGIN (bmain, ntree, id) { if (ntree->type == NTREE_COMPOSIT) { - bNode *node; - for (node = ntree->nodes.first; node; node = node->next) { + LISTBASE_FOREACH (bNode *, node, &ntree->nodes) { if (ELEM(node->type, CMP_NODE_COMPOSITE, CMP_NODE_OUTPUT_FILE)) { - node->id = NULL; + node->id = nullptr; } } } } FOREACH_NODETREE_END; - { - bScreen *screen; - - for (screen = bmain->screens.first; screen; screen = screen->id.next) { - ScrArea *area; - for (area = screen->areabase.first; area; area = area->next) { - SpaceLink *space_link; - for (space_link = area->spacedata.first; space_link; space_link = space_link->next) { - if (space_link->spacetype == SPACE_CLIP) { - SpaceClip *space_clip = (SpaceClip *)space_link; - if (space_clip->mode != SC_MODE_MASKEDIT) { - space_clip->mode = SC_MODE_TRACKING; - } + LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) { + LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) { + LISTBASE_FOREACH (SpaceLink *, space_link, &area->spacedata) { + if (space_link->spacetype == SPACE_CLIP) { + SpaceClip *space_clip = (SpaceClip *)space_link; + if (space_clip->mode != SC_MODE_MASKEDIT) { + space_clip->mode = SC_MODE_TRACKING; } } } @@ -513,24 +498,20 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!DNA_struct_elem_find(fd->filesdna, "MovieTrackingSettings", "float", "default_weight")) { - MovieClip *clip; - for (clip = bmain->movieclips.first; clip; clip = clip->id.next) { + LISTBASE_FOREACH (MovieClip *, clip, &bmain->movieclips) { clip->tracking.settings.default_weight = 1.0f; } } } if (!MAIN_VERSION_ATLEAST(bmain, 270, 1)) { - Object *ob; - /* Update Transform constraint (another deg -> rad stuff). */ - for (ob = bmain->objects.first; ob; ob = ob->id.next) { + LISTBASE_FOREACH (Object *, ob, &bmain->objects) { do_version_constraints_radians_degrees_270_1(&ob->constraints); if (ob->pose) { /* Bones constraints! */ - bPoseChannel *pchan; - for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) { + LISTBASE_FOREACH (bPoseChannel *, pchan, &ob->pose->chanbase) { do_version_constraints_radians_degrees_270_1(&pchan->constraints); } } @@ -538,18 +519,14 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 270, 2)) { - Mesh *me; - /* Mesh smoothresh deg->rad. */ - for (me = bmain->meshes.first; me; me = me->id.next) { + LISTBASE_FOREACH (Mesh *, me, &bmain->meshes) { me->smoothresh = DEG2RADF(me->smoothresh); } } if (!MAIN_VERSION_ATLEAST(bmain, 270, 3)) { - FreestyleLineStyle *linestyle; - - for (linestyle = bmain->linestyles.first; linestyle; linestyle = linestyle->id.next) { + LISTBASE_FOREACH (FreestyleLineStyle *, linestyle, &bmain->linestyles) { linestyle->flag |= LS_NO_SORTING; linestyle->sort_key = LS_SORT_KEY_DISTANCE_FROM_CAMERA; linestyle->integration_type = LS_INTEGRATION_MEAN; @@ -561,18 +538,11 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) * leading to corrupted files (see #39847). * This will always reset situation to a valid state. */ - bScreen *screen; - - for (screen = bmain->screens.first; screen; screen = screen->id.next) { - ScrArea *area; - for (area = screen->areabase.first; area; area = area->next) { - SpaceLink *sl; - - for (sl = area->spacedata.first; sl; sl = sl->next) { - ARegion *region; + LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) { + LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) { + LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) { ListBase *lb = (sl == area->spacedata.first) ? &area->regionbase : &sl->regionbase; - - for (region = lb->first; region; region = region->next) { + LISTBASE_FOREACH (ARegion *, region, lb) { BLI_listbase_clear(®ion->ui_previews); } } @@ -581,16 +551,13 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 270, 5)) { - Object *ob; - /* Update Transform constraint (again :|). */ - for (ob = bmain->objects.first; ob; ob = ob->id.next) { + LISTBASE_FOREACH (Object *, ob, &bmain->objects) { do_version_constraints_radians_degrees_270_5(&ob->constraints); if (ob->pose) { /* Bones constraints! */ - bPoseChannel *pchan; - for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) { + LISTBASE_FOREACH (bPoseChannel *, pchan, &ob->pose->chanbase) { do_version_constraints_radians_degrees_270_5(&pchan->constraints); } } @@ -599,9 +566,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 271, 0)) { if (!DNA_struct_elem_find(fd->filesdna, "RenderData", "BakeData", "bake")) { - Scene *sce; - - for (sce = bmain->scenes.first; sce; sce = sce->id.next) { + LISTBASE_FOREACH (Scene *, sce, &bmain->scenes) { sce->r.bake.flag = R_BAKE_CLEAR; sce->r.bake.width = 512; sce->r.bake.height = 512; @@ -621,17 +586,14 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!DNA_struct_elem_find(fd->filesdna, "FreestyleLineStyle", "float", "texstep")) { - FreestyleLineStyle *linestyle; - - for (linestyle = bmain->linestyles.first; linestyle; linestyle = linestyle->id.next) { + LISTBASE_FOREACH (FreestyleLineStyle *, linestyle, &bmain->linestyles) { linestyle->flag |= LS_TEXTURE; linestyle->texstep = 1.0; } } { - Scene *scene; - for (scene = bmain->scenes.first; scene; scene = scene->id.next) { + LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) { int num_layers = BLI_listbase_count(&scene->r.layers); scene->r.actlay = min_ff(scene->r.actlay, num_layers - 1); } @@ -640,9 +602,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 271, 1)) { if (!DNA_struct_elem_find(fd->filesdna, "Material", "float", "line_col[4]")) { - Material *mat; - - for (mat = bmain->materials.first; mat; mat = mat->id.next) { + LISTBASE_FOREACH (Material *, mat, &bmain->materials) { mat->line_col[0] = mat->line_col[1] = mat->line_col[2] = 0.0f; mat->line_col[3] = mat->alpha; } @@ -650,18 +610,13 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 271, 3)) { - Brush *br; - - for (br = bmain->brushes.first; br; br = br->id.next) { + LISTBASE_FOREACH (Brush *, br, &bmain->brushes) { br->fill_threshold = 0.2f; } if (!DNA_struct_elem_find(fd->filesdna, "BevelModifierData", "int", "mat")) { - Object *ob; - for (ob = bmain->objects.first; ob; ob = ob->id.next) { - ModifierData *md; - - for (md = ob->modifiers.first; md; md = md->next) { + LISTBASE_FOREACH (Object *, ob, &bmain->objects) { + LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) { if (md->type == eModifierType_Bevel) { BevelModifierData *bmd = (BevelModifierData *)md; bmd->mat = -1; @@ -672,11 +627,8 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 271, 6)) { - Object *ob; - for (ob = bmain->objects.first; ob; ob = ob->id.next) { - ModifierData *md; - - for (md = ob->modifiers.first; md; md = md->next) { + LISTBASE_FOREACH (Object *, ob, &bmain->objects) { + LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) { if (md->type == eModifierType_ParticleSystem) { ParticleSystemModifierData *pmd = (ParticleSystemModifierData *)md; if (pmd->psys && pmd->psys->clmd) { @@ -688,8 +640,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 272, 1)) { - Brush *br; - for (br = bmain->brushes.first; br; br = br->id.next) { + LISTBASE_FOREACH (Brush *, br, &bmain->brushes) { if ((br->ob_mode & OB_MODE_SCULPT) && ELEM(br->sculpt_tool, SCULPT_TOOL_GRAB, SCULPT_TOOL_SNAKE_HOOK)) { @@ -700,23 +651,19 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 272, 2)) { if (!DNA_struct_elem_find(fd->filesdna, "Image", "float", "gen_color")) { - Image *image; - for (image = bmain->images.first; image != NULL; image = image->id.next) { + LISTBASE_FOREACH (Image *, image, &bmain->images) { image->gen_color[3] = 1.0f; } } if (!DNA_struct_elem_find(fd->filesdna, "bStretchToConstraint", "float", "bulge_min")) { - Object *ob; - /* Update Transform constraint (again :|). */ - for (ob = bmain->objects.first; ob; ob = ob->id.next) { + LISTBASE_FOREACH (Object *, ob, &bmain->objects) { do_version_constraints_stretch_to_limits(&ob->constraints); if (ob->pose) { /* Bones constraints! */ - bPoseChannel *pchan; - for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) { + LISTBASE_FOREACH (bPoseChannel *, pchan, &ob->pose->chanbase) { do_version_constraints_stretch_to_limits(&pchan->constraints); } } @@ -728,9 +675,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) #define BRUSH_RAKE (1 << 7) #define BRUSH_RANDOM_ROTATION (1 << 25) - Brush *br; - - for (br = bmain->brushes.first; br; br = br->id.next) { + LISTBASE_FOREACH (Brush *, br, &bmain->brushes) { if (br->flag & BRUSH_RAKE) { br->mtex.brush_angle_mode |= MTEX_ANGLE_RAKE; br->mask_mtex.brush_angle_mode |= MTEX_ANGLE_RAKE; @@ -750,9 +695,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) /* Customizable Safe Areas */ if (!MAIN_VERSION_ATLEAST(bmain, 273, 2)) { if (!DNA_struct_elem_find(fd->filesdna, "Scene", "DisplaySafeAreas", "safe_areas")) { - Scene *scene; - - for (scene = bmain->scenes.first; scene; scene = scene->id.next) { + LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) { copy_v2_fl2(scene->safe_areas.title, 3.5f / 100.0f, 3.5f / 100.0f); copy_v2_fl2(scene->safe_areas.action, 10.0f / 100.0f, 5.0f / 100.0f); copy_v2_fl2(scene->safe_areas.title_center, 17.5f / 100.0f, 5.0f / 100.0f); @@ -762,8 +705,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 273, 3)) { - ParticleSettings *part; - for (part = bmain->particles.first; part; part = part->id.next) { + LISTBASE_FOREACH (ParticleSettings *, part, &bmain->particles) { if (part->clumpcurve) { part->child_flag |= PART_CHILD_USE_CLUMP_CURVE; } @@ -775,10 +717,8 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 273, 6)) { if (!DNA_struct_elem_find(fd->filesdna, "ClothSimSettings", "float", "bending_damping")) { - Object *ob; - ModifierData *md; - for (ob = bmain->objects.first; ob; ob = ob->id.next) { - for (md = ob->modifiers.first; md; md = md->next) { + LISTBASE_FOREACH (Object *, ob, &bmain->objects) { + LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) { if (md->type == eModifierType_Cloth) { ClothModifierData *clmd = (ClothModifierData *)md; clmd->sim_parms->bending_damping = 0.5f; @@ -794,24 +734,20 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!DNA_struct_elem_find(fd->filesdna, "ParticleSettings", "float", "clump_noise_size")) { - ParticleSettings *part; - for (part = bmain->particles.first; part; part = part->id.next) { + LISTBASE_FOREACH (ParticleSettings *, part, &bmain->particles) { part->clump_noise_size = 1.0f; } } if (!DNA_struct_elem_find(fd->filesdna, "ParticleSettings", "int", "kink_extra_steps")) { - ParticleSettings *part; - for (part = bmain->particles.first; part; part = part->id.next) { + LISTBASE_FOREACH (ParticleSettings *, part, &bmain->particles) { part->kink_extra_steps = 4; } } if (!DNA_struct_elem_find(fd->filesdna, "MTex", "float", "kinkampfac")) { - ParticleSettings *part; - for (part = bmain->particles.first; part; part = part->id.next) { - int a; - for (a = 0; a < MAX_MTEX; a++) { + LISTBASE_FOREACH (ParticleSettings *, part, &bmain->particles) { + for (int a = 0; a < MAX_MTEX; a++) { MTex *mtex = part->mtex[a]; if (mtex) { mtex->kinkampfac = 1.0f; @@ -821,11 +757,8 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!DNA_struct_elem_find(fd->filesdna, "HookModifierData", "char", "flag")) { - Object *ob; - - for (ob = bmain->objects.first; ob; ob = ob->id.next) { - ModifierData *md; - for (md = ob->modifiers.first; md; md = md->next) { + LISTBASE_FOREACH (Object *, ob, &bmain->objects) { + LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) { if (md->type == eModifierType_Hook) { HookModifierData *hmd = (HookModifierData *)md; hmd->falloff_type = eHook_Falloff_InvSquare; @@ -837,10 +770,10 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!DNA_struct_elem_find(fd->filesdna, "NodePlaneTrackDeformData", "char", "flag")) { FOREACH_NODETREE_BEGIN (bmain, ntree, id) { if (ntree->type == NTREE_COMPOSIT) { - bNode *node; - for (node = ntree->nodes.first; node; node = node->next) { + LISTBASE_FOREACH (bNode *, node, &ntree->nodes) { if (ELEM(node->type, CMP_NODE_PLANETRACKDEFORM)) { - NodePlaneTrackDeformData *data = node->storage; + NodePlaneTrackDeformData *data = static_cast( + node->storage); data->flag = 0; data->motion_blur_samples = 16; data->motion_blur_shutter = 0.5f; @@ -852,8 +785,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!DNA_struct_elem_find(fd->filesdna, "Camera", "GPUDOFSettings", "gpu_dof")) { - Camera *ca; - for (ca = bmain->cameras.first; ca; ca = ca->id.next) { + LISTBASE_FOREACH (Camera *, ca, &bmain->cameras) { ca->gpu_dof.fstop = 128.0f; ca->gpu_dof.focal_length = 1.0f; ca->gpu_dof.focus_distance = 1.0f; @@ -863,10 +795,8 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 273, 8)) { - Object *ob; - for (ob = bmain->objects.first; ob != NULL; ob = ob->id.next) { - ModifierData *md; - for (md = ob->modifiers.last; md != NULL; md = md->prev) { + LISTBASE_FOREACH (Object *, ob, &bmain->objects) { + LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) { if (BKE_modifier_unique_name(&ob->modifiers, md)) { printf( "Warning: Object '%s' had several modifiers with the " @@ -879,17 +809,12 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 273, 9)) { - bScreen *screen; - ScrArea *area; - SpaceLink *sl; - ARegion *region; - /* Make sure sequencer preview area limits zoom */ - for (screen = bmain->screens.first; screen; screen = screen->id.next) { - for (area = screen->areabase.first; area; area = area->next) { - for (sl = area->spacedata.first; sl; sl = sl->next) { + LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) { + LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) { + LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) { if (sl->spacetype == SPACE_SEQ) { - for (region = sl->regionbase.first; region; region = region->next) { + LISTBASE_FOREACH (ARegion *, region, &sl->regionbase) { if (region->regiontype == RGN_TYPE_PREVIEW) { region->v2d.keepzoom |= V2D_LIMITZOOM; region->v2d.minzoom = 0.001f; @@ -906,10 +831,8 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 274, 1)) { /* particle systems need to be forced to redistribute for jitter mode fix */ { - Object *ob; - ParticleSystem *psys; - for (ob = bmain->objects.first; ob; ob = ob->id.next) { - for (psys = ob->particlesystem.first; psys; psys = psys->next) { + LISTBASE_FOREACH (Object *, ob, &bmain->objects) { + LISTBASE_FOREACH (ParticleSystem *, psys, &ob->particlesystem) { if ((psys->pointcache->flag & PTCACHE_BAKED) == 0) { psys->recalc |= ID_RECALC_PSYS_RESET; } @@ -919,34 +842,23 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 274, 4)) { - SceneRenderView *srv; - wmWindowManager *wm; - bScreen *screen; - wmWindow *win; - Scene *scene; - Camera *cam; - Image *ima; - - for (scene = bmain->scenes.first; scene; scene = scene->id.next) { + LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) { BKE_scene_add_render_view(scene, STEREO_LEFT_NAME); - srv = scene->r.views.first; + SceneRenderView *srv = static_cast(scene->r.views.first); STRNCPY(srv->suffix, STEREO_LEFT_SUFFIX); BKE_scene_add_render_view(scene, STEREO_RIGHT_NAME); - srv = scene->r.views.last; + srv = static_cast(scene->r.views.last); STRNCPY(srv->suffix, STEREO_RIGHT_SUFFIX); if (scene->ed) { - SEQ_for_each_callback(&scene->ed->seqbase, seq_update_proxy_cb, NULL); + SEQ_for_each_callback(&scene->ed->seqbase, seq_update_proxy_cb, nullptr); } } - for (screen = bmain->screens.first; screen; screen = screen->id.next) { - ScrArea *area; - for (area = screen->areabase.first; area; area = area->next) { - SpaceLink *sl; - - for (sl = area->spacedata.first; sl; sl = sl->next) { + LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) { + LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) { + LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) { switch (sl->spacetype) { case SPACE_VIEW3D: { View3D *v3d = (View3D *)sl; @@ -966,42 +878,39 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - for (cam = bmain->cameras.first; cam; cam = cam->id.next) { + LISTBASE_FOREACH (Camera *, cam, &bmain->cameras) { cam->stereo.interocular_distance = 0.065f; cam->stereo.convergence_distance = 30.0f * 0.065f; } - for (ima = bmain->images.first; ima; ima = ima->id.next) { - ima->stereo3d_format = MEM_callocN(sizeof(Stereo3dFormat), "Image Stereo 3d Format"); + LISTBASE_FOREACH (Image *, ima, &bmain->images) { + ima->stereo3d_format = static_cast( + MEM_callocN(sizeof(Stereo3dFormat), "Image Stereo 3d Format")); if (ima->packedfile) { - ImagePackedFile *imapf = MEM_mallocN(sizeof(ImagePackedFile), "Image Packed File"); + ImagePackedFile *imapf = static_cast( + MEM_mallocN(sizeof(ImagePackedFile), "Image Packed File")); BLI_addtail(&ima->packedfiles, imapf); imapf->packedfile = ima->packedfile; STRNCPY(imapf->filepath, ima->filepath); - ima->packedfile = NULL; + ima->packedfile = nullptr; } } - for (wm = bmain->wm.first; wm; wm = wm->id.next) { - for (win = wm->windows.first; win; win = win->next) { - win->stereo3d_format = MEM_callocN(sizeof(Stereo3dFormat), "Stereo Display 3d Format"); + LISTBASE_FOREACH (wmWindowManager *, wm, &bmain->wm) { + LISTBASE_FOREACH (wmWindow *, win, &wm->windows) { + win->stereo3d_format = static_cast( + MEM_callocN(sizeof(Stereo3dFormat), "Stereo Display 3d Format")); } } } if (!MAIN_VERSION_ATLEAST(bmain, 274, 6)) { - bScreen *screen; - if (!DNA_struct_elem_find(fd->filesdna, "FileSelectParams", "int", "thumbnail_size")) { - for (screen = bmain->screens.first; screen; screen = screen->id.next) { - ScrArea *area; - - for (area = screen->areabase.first; area; area = area->next) { - SpaceLink *sl; - - for (sl = area->spacedata.first; sl; sl = sl->next) { + LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) { + LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) { + LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) { if (sl->spacetype == SPACE_FILE) { SpaceFile *sfile = (SpaceFile *)sl; @@ -1015,19 +924,15 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!DNA_struct_elem_find(fd->filesdna, "RenderData", "short", "simplify_subsurf_render")) { - Scene *scene; - for (scene = bmain->scenes.first; scene != NULL; scene = scene->id.next) { + LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) { scene->r.simplify_subsurf_render = scene->r.simplify_subsurf; scene->r.simplify_particles_render = scene->r.simplify_particles; } } if (!DNA_struct_elem_find(fd->filesdna, "DecimateModifierData", "float", "defgrp_factor")) { - Object *ob; - - for (ob = bmain->objects.first; ob; ob = ob->id.next) { - ModifierData *md; - for (md = ob->modifiers.first; md; md = md->next) { + LISTBASE_FOREACH (Object *, ob, &bmain->objects) { + LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) { if (md->type == eModifierType_Decimate) { DecimateModifierData *dmd = (DecimateModifierData *)md; dmd->defgrp_factor = 1.0f; @@ -1038,9 +943,8 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 275, 3)) { - Brush *br; #define BRUSH_TORUS (1 << 1) - for (br = bmain->brushes.first; br; br = br->id.next) { + LISTBASE_FOREACH (Brush *, br, &bmain->brushes) { br->flag &= ~BRUSH_TORUS; } #undef BRUSH_TORUS @@ -1048,62 +952,50 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 276, 2)) { if (!DNA_struct_elem_find(fd->filesdna, "bPoseChannel", "float", "custom_scale")) { - Object *ob; - - for (ob = bmain->objects.first; ob; ob = ob->id.next) { + LISTBASE_FOREACH (Object *, ob, &bmain->objects) { if (ob->pose) { - bPoseChannel *pchan; - for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) { + LISTBASE_FOREACH (bPoseChannel *, pchan, &ob->pose->chanbase) { pchan->custom_scale = 1.0f; } } } } - { - bScreen *screen; #define RV3D_VIEW_PERSPORTHO 7 - for (screen = bmain->screens.first; screen; screen = screen->id.next) { - ScrArea *area; - for (area = screen->areabase.first; area; area = area->next) { - SpaceLink *sl; - for (sl = area->spacedata.first; sl; sl = sl->next) { - if (sl->spacetype == SPACE_VIEW3D) { - ARegion *region; - ListBase *lb = (sl == area->spacedata.first) ? &area->regionbase : &sl->regionbase; - for (region = lb->first; region; region = region->next) { - if (region->regiontype == RGN_TYPE_WINDOW) { - if (region->regiondata) { - RegionView3D *rv3d = region->regiondata; - if (rv3d->view == RV3D_VIEW_PERSPORTHO) { - rv3d->view = RV3D_VIEW_USER; - } + LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) { + LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) { + LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) { + if (sl->spacetype == SPACE_VIEW3D) { + ListBase *lb = (sl == area->spacedata.first) ? &area->regionbase : &sl->regionbase; + LISTBASE_FOREACH (ARegion *, region, lb) { + if (region->regiontype == RGN_TYPE_WINDOW) { + if (region->regiondata) { + RegionView3D *rv3d = static_cast(region->regiondata); + if (rv3d->view == RV3D_VIEW_PERSPORTHO) { + rv3d->view = RV3D_VIEW_USER; } } } - break; } + break; } } } + } #undef RV3D_VIEW_PERSPORTHO - } - { #define LA_YF_PHOTON 5 - for (Light *la = bmain->lights.first; la; la = la->id.next) { - if (la->type == LA_YF_PHOTON) { - la->type = LA_LOCAL; - } + LISTBASE_FOREACH (Light *, la, &bmain->lights) { + if (la->type == LA_YF_PHOTON) { + la->type = LA_LOCAL; } -#undef LA_YF_PHOTON } +#undef LA_YF_PHOTON } if (!MAIN_VERSION_ATLEAST(bmain, 276, 3)) { if (!DNA_struct_elem_find(fd->filesdna, "RenderData", "CurveMapping", "mblur_shutter_curve")) { - Scene *scene; - for (scene = bmain->scenes.first; scene != NULL; scene = scene->id.next) { + LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) { CurveMapping *curve_mapping = &scene->r.mblur_shutter_curve; BKE_curvemapping_set_defaults(curve_mapping, 1, 0.0f, 0.0f, 1.0f, 1.0f); BKE_curvemapping_init(curve_mapping); @@ -1114,7 +1006,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 276, 4)) { - for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { + LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) { ToolSettings *ts = scene->toolsettings; if (!DNA_struct_elem_find(fd->filesdna, "ToolSettings", "char", "gpencil_v3d_align")) { ts->gpencil_v3d_align = GP_PROJECT_VIEWSPACE; @@ -1122,7 +1014,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - for (bGPdata *gpd = bmain->gpencils.first; gpd; gpd = gpd->id.next) { + LISTBASE_FOREACH (bGPdata *, gpd, &bmain->gpencils) { bool enabled = false; /* Ensure that the datablock's onion-skinning toggle flag @@ -1157,14 +1049,13 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 276, 7)) { - Scene *scene; - for (scene = bmain->scenes.first; scene != NULL; scene = scene->id.next) { + LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) { scene->r.bake.pass_filter = R_BAKE_PASS_FILTER_ALL; } } if (!MAIN_VERSION_ATLEAST(bmain, 277, 1)) { - for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { + LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) { ParticleEditSettings *pset = &scene->toolsettings->particle; for (int a = 0; a < ARRAY_SIZE(pset->brush); a++) { if (pset->brush[a].strength > 1.0f) { @@ -1173,7 +1064,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { + LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) { LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) { LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) { ListBase *regionbase = (sl == area->spacedata.first) ? &area->regionbase : @@ -1197,7 +1088,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) LISTBASE_FOREACH (ARegion *, region, regionbase) { if (region->regiontype == RGN_TYPE_CHANNELS) { /* Free old deprecated 'channel' region... */ - BKE_area_region_free(NULL, region); + BKE_area_region_free(nullptr, region); BLI_freelinkN(regionbase, region); break; } @@ -1207,7 +1098,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { + LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) { CurvePaintSettings *cps = &scene->toolsettings->curve_paint_settings; if (cps->error_threshold == 0) { cps->curve_type = CU_BEZIER; @@ -1218,14 +1109,14 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { + LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) { if (scene->ed) { - SEQ_for_each_callback(&scene->ed->seqbase, seq_update_effectdata_cb, NULL); + SEQ_for_each_callback(&scene->ed->seqbase, seq_update_effectdata_cb, nullptr); } } /* Adding "Properties" region to DopeSheet */ - for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { + LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) { LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) { /* handle pushed-back space data first */ LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) { @@ -1245,12 +1136,12 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 277, 2)) { if (!DNA_struct_elem_find(fd->filesdna, "Bone", "float", "scaleIn")) { - for (bArmature *arm = bmain->armatures.first; arm; arm = arm->id.next) { + LISTBASE_FOREACH (bArmature *, arm, &bmain->armatures) { do_version_bones_super_bbone(&arm->bonebase); } } if (!DNA_struct_elem_find(fd->filesdna, "bPoseChannel", "float", "scaleIn")) { - for (Object *ob = bmain->objects.first; ob; ob = ob->id.next) { + LISTBASE_FOREACH (Object *, ob, &bmain->objects) { if (ob->pose) { LISTBASE_FOREACH (bPoseChannel *, pchan, &ob->pose->chanbase) { /* see do_version_bones_super_bbone()... */ @@ -1270,7 +1161,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - for (Camera *camera = bmain->cameras.first; camera != NULL; camera = camera->id.next) { + LISTBASE_FOREACH (Camera *, camera, &bmain->cameras) { if (camera->stereo.pole_merge_angle_from == 0.0f && camera->stereo.pole_merge_angle_to == 0.0f) { camera->stereo.pole_merge_angle_from = DEG2RADF(60.0f); @@ -1279,11 +1170,8 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!DNA_struct_elem_find(fd->filesdna, "NormalEditModifierData", "float", "mix_limit")) { - Object *ob; - - for (ob = bmain->objects.first; ob; ob = ob->id.next) { - ModifierData *md; - for (md = ob->modifiers.first; md; md = md->next) { + LISTBASE_FOREACH (Object *, ob, &bmain->objects) { + LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) { if (md->type == eModifierType_NormalEdit) { NormalEditModifierData *nemd = (NormalEditModifierData *)md; nemd->mix_limit = DEG2RADF(180.0f); @@ -1293,10 +1181,8 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!DNA_struct_elem_find(fd->filesdna, "BooleanModifierData", "float", "double_threshold")) { - Object *ob; - for (ob = bmain->objects.first; ob; ob = ob->id.next) { - ModifierData *md; - for (md = ob->modifiers.first; md; md = md->next) { + LISTBASE_FOREACH (Object *, ob, &bmain->objects) { + LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) { if (md->type == eModifierType_Boolean) { BooleanModifierData *bmd = (BooleanModifierData *)md; bmd->double_threshold = 1e-6f; @@ -1305,17 +1191,15 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - for (Brush *br = bmain->brushes.first; br; br = br->id.next) { + LISTBASE_FOREACH (Brush *, br, &bmain->brushes) { if (br->sculpt_tool == SCULPT_TOOL_FLATTEN) { br->flag |= BRUSH_ACCUMULATE; } } if (!DNA_struct_elem_find(fd->filesdna, "ClothSimSettings", "float", "time_scale")) { - Object *ob; - ModifierData *md; - for (ob = bmain->objects.first; ob; ob = ob->id.next) { - for (md = ob->modifiers.first; md; md = md->next) { + LISTBASE_FOREACH (Object *, ob, &bmain->objects) { + LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) { if (md->type == eModifierType_Cloth) { ClothModifierData *clmd = (ClothModifierData *)md; clmd->sim_parms->time_scale = 1.0f; @@ -1337,14 +1221,14 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) /* Convert Grease Pencil to new palettes/brushes * Loop all strokes and create the palette and all colors */ - for (bGPdata *gpd = bmain->gpencils.first; gpd; gpd = gpd->id.next) { + LISTBASE_FOREACH (bGPdata *, gpd, &bmain->gpencils) { if (BLI_listbase_is_empty(&gpd->palettes)) { /* create palette */ bGPDpalette *palette = BKE_gpencil_palette_addnew(gpd, "GP_Palette"); LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd->layers) { /* create color using layer name */ bGPDpalettecolor *palcolor = BKE_gpencil_palettecolor_addnew(palette, gpl->info); - if (palcolor != NULL) { + if (palcolor != nullptr) { /* set color attributes */ copy_v4_v4(palcolor->color, gpl->color); copy_v4_v4(palcolor->fill, gpl->fill); @@ -1406,8 +1290,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!DNA_struct_elem_find(fd->filesdna, "MovieTrackingStabilization", "int", "tot_rot_track")) { - MovieClip *clip; - for (clip = bmain->movieclips.first; clip != NULL; clip = clip->id.next) { + LISTBASE_FOREACH (MovieClip *, clip, &bmain->movieclips) { if (clip->tracking.stabilization.rot_track_legacy) { migrate_single_rot_stabilization_track_settings(&clip->tracking.stabilization); } @@ -1427,24 +1310,21 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 278, 2)) { if (!DNA_struct_elem_find(fd->filesdna, "FFMpegCodecData", "int", "ffmpeg_preset")) { - for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { + LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) { /* "medium" is the preset FFmpeg uses when no presets are given. */ scene->r.ffcodecdata.ffmpeg_preset = FFM_PRESET_MEDIUM; } } if (!DNA_struct_elem_find(fd->filesdna, "FFMpegCodecData", "int", "constant_rate_factor")) { - for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { + LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) { /* fall back to behavior from before we introduced CRF for old files */ scene->r.ffcodecdata.constant_rate_factor = FFM_CRF_NONE; } } if (!DNA_struct_elem_find(fd->filesdna, "FluidModifierData", "float", "slice_per_voxel")) { - Object *ob; - ModifierData *md; - - for (ob = bmain->objects.first; ob; ob = ob->id.next) { - for (md = ob->modifiers.first; md; md = md->next) { + LISTBASE_FOREACH (Object *, ob, &bmain->objects) { + LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) { if (md->type == eModifierType_Fluid) { FluidModifierData *fmd = (FluidModifierData *)md; if (fmd->domain) { @@ -1459,8 +1339,8 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 278, 3)) { - for (Scene *scene = bmain->scenes.first; scene != NULL; scene = scene->id.next) { - if (scene->toolsettings != NULL) { + LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) { + if (scene->toolsettings != nullptr) { ToolSettings *ts = scene->toolsettings; ParticleEditSettings *pset = &ts->particle; for (int a = 0; a < ARRAY_SIZE(pset->brush); a++) { @@ -1472,8 +1352,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!DNA_struct_elem_find(fd->filesdna, "RigidBodyCon", "float", "spring_stiffness_ang_x")) { - Object *ob; - for (ob = bmain->objects.first; ob; ob = ob->id.next) { + LISTBASE_FOREACH (Object *, ob, &bmain->objects) { RigidBodyCon *rbc = ob->rigidbody_constraint; if (rbc) { rbc->spring_stiffness_ang_x = 10.0; @@ -1488,8 +1367,8 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) /* constant detail for sculpting is now a resolution value instead of * a percentage, we reuse old DNA struct member but convert it */ - for (Scene *scene = bmain->scenes.first; scene != NULL; scene = scene->id.next) { - if (scene->toolsettings != NULL) { + LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) { + if (scene->toolsettings != nullptr) { ToolSettings *ts = scene->toolsettings; if (ts->sculpt && ts->sculpt->constant_detail != 0.0f) { ts->sculpt->constant_detail = 100.0f / ts->sculpt->constant_detail; @@ -1500,17 +1379,14 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 278, 4)) { const float sqrt_3 = (float)M_SQRT3; - for (Brush *br = bmain->brushes.first; br; br = br->id.next) { + LISTBASE_FOREACH (Brush *, br, &bmain->brushes) { br->fill_threshold /= sqrt_3; } /* Custom motion paths */ if (!DNA_struct_elem_find(fd->filesdna, "bMotionPath", "int", "line_thickness")) { - Object *ob; - for (ob = bmain->objects.first; ob; ob = ob->id.next) { - bMotionPath *mpath; - bPoseChannel *pchan; - mpath = ob->mpath; + LISTBASE_FOREACH (Object *, ob, &bmain->objects) { + bMotionPath *mpath = ob->mpath; if (mpath) { mpath->color[0] = 1.0f; mpath->color[1] = 0.0f; @@ -1520,8 +1396,8 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } /* bones motion path */ if (ob->pose) { - for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) { - mpath = pchan->mpath; + LISTBASE_FOREACH (bPoseChannel *, pchan, &ob->pose->chanbase) { + bMotionPath *mpath = pchan->mpath; if (mpath) { mpath->color[0] = 1.0f; mpath->color[1] = 0.0f; @@ -1537,7 +1413,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 278, 5)) { /* Mask primitive adding code was not initializing correctly id_type of its points' parent. */ - for (Mask *mask = bmain->masks.first; mask; mask = mask->id.next) { + LISTBASE_FOREACH (Mask *, mask, &bmain->masks) { LISTBASE_FOREACH (MaskLayer *, mlayer, &mask->masklayers) { LISTBASE_FOREACH (MaskSpline *, mspline, &mlayer->splines) { int i = 0; @@ -1555,10 +1431,10 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!DNA_struct_elem_find(fd->filesdna, "NodeGlare", "char", "star_45")) { FOREACH_NODETREE_BEGIN (bmain, ntree, id) { if (ntree->type == NTREE_COMPOSIT) { - ntreeSetTypes(NULL, ntree); + ntreeSetTypes(nullptr, ntree); LISTBASE_FOREACH (bNode *, node, &ntree->nodes) { if (node->type == CMP_NODE_GLARE) { - NodeGlare *ndg = node->storage; + NodeGlare *ndg = static_cast(node->storage); switch (ndg->type) { case 2: /* Grrrr! magic numbers :( */ ndg->streaks = ndg->angle; @@ -1577,7 +1453,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!DNA_struct_elem_find(fd->filesdna, "SurfaceDeformModifierData", "float", "mat[4][4]")) { - for (Object *ob = bmain->objects.first; ob; ob = ob->id.next) { + LISTBASE_FOREACH (Object *, ob, &bmain->objects) { LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) { if (md->type == eModifierType_SurfaceDeform) { SurfaceDeformModifierData *smd = (SurfaceDeformModifierData *)md; @@ -1596,25 +1472,22 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 279, 0)) { - for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { + LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) { if (scene->r.im_format.exr_codec == R_IMF_EXR_CODEC_DWAB) { scene->r.im_format.exr_codec = R_IMF_EXR_CODEC_DWAA; } } /* Fix related to VGroup modifiers creating named defgroup CD layers! See #51520. */ - for (Mesh *me = bmain->meshes.first; me; me = me->id.next) { + LISTBASE_FOREACH (Mesh *, me, &bmain->meshes) { CustomData_set_layer_name(&me->vdata, CD_MDEFORMVERT, 0, ""); } } if (!MAIN_VERSION_ATLEAST(bmain, 279, 3)) { if (!DNA_struct_elem_find(fd->filesdna, "FluidDomainSettings", "float", "clipping")) { - Object *ob; - ModifierData *md; - - for (ob = bmain->objects.first; ob; ob = ob->id.next) { - for (md = ob->modifiers.first; md; md = md->next) { + LISTBASE_FOREACH (Object *, ob, &bmain->objects) { + LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) { if (md->type == eModifierType_Fluid) { FluidModifierData *fmd = (FluidModifierData *)md; if (fmd->domain) { @@ -1628,27 +1501,27 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 279, 4)) { /* Fix for invalid state of screen due to bug in older versions. */ - for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { + LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) { LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) { if (area->full && screen->state == SCREENNORMAL) { - area->full = NULL; + area->full = nullptr; } } } if (!DNA_struct_elem_find(fd->filesdna, "Brush", "float", "falloff_angle")) { - for (Brush *br = bmain->brushes.first; br; br = br->id.next) { + LISTBASE_FOREACH (Brush *, br, &bmain->brushes) { br->falloff_angle = DEG2RADF(80); /* These flags are used for new features. They are not related to `falloff_angle`. */ br->flag &= ~(BRUSH_INVERT_TO_SCRAPE_FILL | BRUSH_ORIGINAL_PLANE | BRUSH_GRAB_ACTIVE_VERTEX | BRUSH_SCENE_SPACING | BRUSH_FRONTFACE_FALLOFF); } - for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { + LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) { ToolSettings *ts = scene->toolsettings; for (int i = 0; i < 2; i++) { VPaint *vp = i ? ts->vpaint : ts->wpaint; - if (vp != NULL) { + if (vp != nullptr) { /* remove all other flags */ vp->flag &= (VP_FLAG_VGROUP_RESTRICT); } @@ -1659,7 +1532,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) /* Simple deform modifier no longer assumes Z axis (X for bend type). * Must set previous defaults. */ if (!DNA_struct_elem_find(fd->filesdna, "SimpleDeformModifierData", "char", "deform_axis")) { - for (Object *ob = bmain->objects.first; ob; ob = ob->id.next) { + LISTBASE_FOREACH (Object *, ob, &bmain->objects) { LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) { if (md->type == eModifierType_SimpleDeform) { SimpleDeformModifierData *smd = (SimpleDeformModifierData *)md; @@ -1669,7 +1542,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { + LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) { int preset = scene->r.ffcodecdata.ffmpeg_preset; if (preset == FFM_PRESET_NONE || preset >= FFM_PRESET_GOOD) { continue; @@ -1689,7 +1562,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!DNA_struct_elem_find( fd->filesdna, "ParticleInstanceModifierData", "float", "particle_amount")) { - for (Object *ob = bmain->objects.first; ob; ob = ob->id.next) { + LISTBASE_FOREACH (Object *, ob, &bmain->objects) { LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) { if (md->type == eModifierType_ParticleInstance) { ParticleInstanceModifierData *pimd = (ParticleInstanceModifierData *)md; @@ -1708,7 +1581,7 @@ void do_versions_after_linking_270(Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 279, 0)) { FOREACH_NODETREE_BEGIN (bmain, ntree, id) { if (ntree->type == NTREE_COMPOSIT) { - ntreeSetTypes(NULL, ntree); + ntreeSetTypes(nullptr, ntree); LISTBASE_FOREACH (bNode *, node, &ntree->nodes) { if (node->type == CMP_NODE_HUE_SAT) { do_version_hue_sat_node(ntree, node); @@ -1722,6 +1595,6 @@ void do_versions_after_linking_270(Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 279, 2)) { /* B-Bones (bbone_in/out -> bbone_easein/out) + Stepped FMod Frame Start/End fix */ /* if (!DNA_struct_elem_find(fd->filesdna, "Bone", "float", "bbone_easein")) */ - BKE_fcurves_main_cb(bmain, do_version_bbone_easing_fcurve_fix, NULL); + BKE_fcurves_main_cb(bmain, do_version_bbone_easing_fcurve_fix, nullptr); } }