diff options
Diffstat (limited to 'source/blender/render')
4 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/render/intern/source/envmap.c b/source/blender/render/intern/source/envmap.c index ac814e9e033..311ec1efc6b 100644 --- a/source/blender/render/intern/source/envmap.c +++ b/source/blender/render/intern/source/envmap.c @@ -149,7 +149,7 @@ static Render *envmap_render_copy(Render *re, EnvMap *env) /* set up renderdata */ envre->r = re->r; envre->r.mode &= ~(R_BORDER | R_PANORAMA | R_ORTHO | R_MBLUR); - envre->r.layers.first = envre->r.layers.last = NULL; + BLI_listbase_clear(&envre->r.layers); envre->r.filtertype = 0; envre->r.tilex = envre->r.xsch / 2; envre->r.tiley = envre->r.ysch / 2; @@ -202,11 +202,11 @@ static void envmap_free_render_copy(Render *envre) envre->totlamp = 0; envre->totinstance = 0; envre->sortedhalos = NULL; - envre->lights.first = envre->lights.last = NULL; - envre->objecttable.first = envre->objecttable.last = NULL; - envre->customdata_names.first = envre->customdata_names.last = NULL; + BLI_listbase_clear(&envre->lights); + BLI_listbase_clear(&envre->objecttable); + BLI_listbase_clear(&envre->customdata_names); envre->raytree = NULL; - envre->instancetable.first = envre->instancetable.last = NULL; + BLI_listbase_clear(&envre->instancetable); envre->objectinstance = NULL; envre->qmcsamplers = NULL; diff --git a/source/blender/render/intern/source/multires_bake.c b/source/blender/render/intern/source/multires_bake.c index 3ae075b4936..be6d0111819 100644 --- a/source/blender/render/intern/source/multires_bake.c +++ b/source/blender/render/intern/source/multires_bake.c @@ -1197,7 +1197,7 @@ static void count_images(MultiresBakeRender *bkr) DerivedMesh *dm = bkr->lores_dm; MTFace *mtface = CustomData_get_layer(&dm->faceData, CD_MTFACE); - bkr->image.first = bkr->image.last = NULL; + BLI_listbase_clear(&bkr->image); bkr->tot_image = 0; totface = dm->getNumTessFaces(dm); diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c index 5e8b030c3fa..b174748a050 100644 --- a/source/blender/render/intern/source/render_result.c +++ b/source/blender/render/intern/source/render_result.c @@ -576,7 +576,7 @@ RenderResult *render_result_new(Render *re, rcti *partrct, int crop, int savebuf render_layer_add_pass(rr, rl, 3, SCE_PASS_SUBSURFACE_COLOR); } /* sss, previewrender and envmap don't do layers, so we make a default one */ - if (rr->layers.first == NULL && !(layername && layername[0])) { + if (BLI_listbase_is_empty(&rr->layers) && !(layername && layername[0])) { rl = MEM_callocN(sizeof(RenderLayer), "new render layer"); BLI_addtail(&rr->layers, rl); diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c index 1fb65a4782e..c3ca3ee4559 100644 --- a/source/blender/render/intern/source/rendercore.c +++ b/source/blender/render/intern/source/rendercore.c @@ -926,7 +926,7 @@ static void freeps(ListBase *lb) MEM_freeN(psm->ps); MEM_freeN(psm); } - lb->first= lb->last= NULL; + BLI_listbase_clear(lb); } static void addps(ListBase *lb, intptr_t *rd, int obi, int facenr, int z, int maskz, unsigned short mask) |