[Bf-blender-cvs] [acce9f0] master: Fix for wrong boolean flag check

[Sergey Sharybin]

Commit: acce9f0841e9b944ac881868d3a5237bda2f9e0e
Author: Sergey Sharybin
Date:   Thu Jan 8 14:42:15 2015 +0500
Branches: master
https://developer.blender.org/rBacce9f0841e9b944ac881868d3a5237bda2f9e0e

Fix for wrong boolean flag check

This fixes obvious overflows when checking bitflags, who knows how much
undiscovered issues exists in the code still..

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

M       source/blender/editors/render/render_internal.c
M       source/blender/render/intern/source/convertblender.c

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

diff --git a/source/blender/editors/render/render_internal.c 
b/source/blender/editors/render/render_internal.c
index fcc90fa..b04f1d3 100644
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -1445,7 +1445,7 @@ static void render_view3d_do(RenderEngine *engine, const 
bContext *C)
        rp->bmain = CTX_data_main(C);
        rp->resolution_divider = divider;
        rp->start_resolution_divider = divider;
-       rp->has_freestyle = scene->r.mode & R_EDGE_FRS;
+       rp->has_freestyle = (scene->r.mode & R_EDGE_FRS) != 0;
        copy_m4_m4(rp->viewmat, rp->rv3d->viewmat);
        
        /* clear info text */
diff --git a/source/blender/render/intern/source/convertblender.c 
b/source/blender/render/intern/source/convertblender.c
index 6437bba..c7170cf 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -5235,7 +5235,7 @@ void RE_Database_Preprocess(Render *re)
                }
                
                if (!re->test_break(re->tbh))
-                       project_renderdata(re, projectverto, re->r.mode & 
R_PANORAMA, 0, 1);
+                       project_renderdata(re, projectverto, (re->r.mode & 
R_PANORAMA) != 0, 0, 1);
                
                /* Occlusion */
                if ((re->wrld.mode & 
(WO_AMB_OCC|WO_ENV_LIGHT|WO_INDIRECT_LIGHT)) && !re->test_break(re->tbh))
@@ -5333,7 +5333,7 @@ static void database_fromscene_vectors(Render *re, Scene 
*scene, unsigned int la
        database_init_objects(re, lay, 0, 0, NULL, timeoffset);
        
        if (!re->test_break(re->tbh))
-               project_renderdata(re, projectverto, re->r.mode & R_PANORAMA, 
0, 1);
+               project_renderdata(re, projectverto, (re->r.mode & R_PANORAMA) 
!= 0, 0, 1);
 
        /* do this in end, particles for example need cfra */
        scene->r.cfra -= timeoffset;

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