diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-03 19:12:39 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-03 19:12:39 +0300 |
| commit | e52beb373323122f6d706e887a8ee3e2c58beb2e (patch) | |
| tree | 0e409009d8aa4df733fe50dee504ae361040a171 /source/blender/render | |
| parent | c713e9c4724f2f75e28eb421021ed0428e919aab (diff) | |
| parent | ab695c32974fde8720c04dff47d240b7fa0f8151 (diff) | |
Merge branch 'master' into blender2.8
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 170cd0ad419..84b64b84298 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -3343,7 +3343,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); @@ -3460,7 +3460,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; @@ -4050,7 +4050,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 c5d1dfc50f4..5abef431f3d 100644 --- a/source/blender/render/intern/source/render_result.c +++ b/source/blender/render/intern/source/render_result.c @@ -740,7 +740,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, ""); } } |