diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-03 18:05:21 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-03 18:05:21 +0300 |
| commit | bfdb88f3f4a49249cea9ad954eb3b08ea290b81b (patch) | |
| tree | eccf98a7ea2b12b3d00a8564df398ae7ea3cffc8 /source/blender/render | |
| parent | 06a62d4e06445506b69b9d83c3ab5480254d40da (diff) | |
Cleanup: rename list count_ex -> count_at_most
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 6 | ||||
| -rw-r--r-- | source/blender/render/intern/source/render_result.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index e17a503cd4e..201e11aca77 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -3349,7 +3349,7 @@ bool RE_WriteRenderViewsImage(ReportList *reports, RenderResult *rr, Scene *scen if (!rr) return false; - bool is_mono = BLI_listbase_count_ex(&rr->views, 2) < 2; + bool is_mono = BLI_listbase_count_at_most(&rr->views, 2) < 2; bool is_exr_rr = ELEM(rd->im_format.imtype, R_IMF_IMTYPE_OPENEXR, R_IMF_IMTYPE_MULTILAYER) && RE_HasFloatPixels(rr); @@ -3466,7 +3466,7 @@ bool RE_WriteRenderViewsMovie( if (!rr) return false; - is_mono = BLI_listbase_count_ex(&rr->views, 2) < 2; + is_mono = BLI_listbase_count_at_most(&rr->views, 2) < 2; if (is_mono || (scene->r.im_format.views_format == R_IMF_VIEWS_INDIVIDUAL)) { int view_id; @@ -4067,7 +4067,7 @@ bool RE_WriteEnvmapResult(struct ReportList *reports, Scene *scene, EnvMap *env, /* Used in the interface to decide whether to show layers or passes. */ bool RE_layers_have_name(struct RenderResult *rr) { - switch (BLI_listbase_count_ex(&rr->layers, 2)) { + switch (BLI_listbase_count_at_most(&rr->layers, 2)) { case 0: return false; case 1: diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c index 542c737348b..25377fb4f7e 100644 --- a/source/blender/render/intern/source/render_result.c +++ b/source/blender/render/intern/source/render_result.c @@ -753,7 +753,7 @@ void render_result_views_new(RenderResult *rr, RenderData *rd) } /* we always need at least one view */ - if (BLI_listbase_count_ex(&rr->views, 1) == 0) { + if (BLI_listbase_count_at_most(&rr->views, 1) == 0) { render_result_view_new(rr, ""); } } |