[Bf-blender-cvs] [ea85ef9] multiview: Fix for is_mono test

[Dalai Felinto]

Commit: ea85ef9a1763258d87fb24cc67df2d6ebfa8f22d
Author: Dalai Felinto
Date:   Fri Aug 29 12:20:35 2014 +0200
Branches: multiview
https://developer.blender.org/rBea85ef9a1763258d87fb24cc67df2d6ebfa8f22d

Fix for is_mono test

(meaning we were doing multiview in some times when we should be doing
mono rendering)

===================================================================

M       source/blender/render/intern/source/pipeline.c

===================================================================

diff --git a/source/blender/render/intern/source/pipeline.c 
b/source/blender/render/intern/source/pipeline.c
index 6535527..7762963 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -3070,7 +3070,7 @@ bool RE_WriteRenderViews(ReportList *reports, 
RenderResult *rr, Scene *scene, co
        if (!rr)
                return false;
 
-       is_mono = (rd->scemode & R_MULTIVIEW) && BLI_countlist(&rr->views) < 2;
+       is_mono = BLI_countlist(&rr->views) < 2;
 
        if (rd->im_format.imtype == R_IMF_IMTYPE_MULTIVIEW) {
                RE_WriteRenderResult(reports, rr, name, &rd->im_format, true, 
NULL);
@@ -3078,7 +3078,7 @@ bool RE_WriteRenderViews(ReportList *reports, 
RenderResult *rr, Scene *scene, co
        }
 
        /* mono, legacy code */
-       else if ((is_mono) || (rd->im_format.views_output == 
R_IMF_VIEWS_INDIVIDUAL))
+       else if (is_mono || (rd->im_format.views_output == 
R_IMF_VIEWS_INDIVIDUAL))
        {
                RenderView *rv;
                size_t view_id;
@@ -3213,12 +3213,11 @@ static int do_write_image_or_movie(Render *re, Main 
*bmain, Scene *scene, bMovie
        bool is_mono;
        
        RE_AcquireResultImage(re, &rres, -1);
-       is_mono = (scene->r.scemode & R_MULTIVIEW) && 
BLI_countlist(&rres.views) < 2;
+       is_mono = BLI_countlist(&rres.views) < 2;
 
        /* write movie or image */
        if (BKE_imtype_is_movie(scene->r.im_format.imtype)) {
-               if ((is_mono) ||
-                   (scene->r.im_format.views_output == R_IMF_VIEWS_INDIVIDUAL))
+               if (is_mono || (scene->r.im_format.views_output == 
R_IMF_VIEWS_INDIVIDUAL))
                {
                        size_t view_id;
                        for (view_id = 0; view_id < totvideos; view_id++) {

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs