[Bf-blender-cvs] [52655f51619] master: Cleanup: flag checks

[Campbell Barton]

Commit: 52655f51619d0ab06bbde6966c31d15f6ab4ab19
Author: Campbell Barton
Date:   Thu Jul 5 22:49:42 2018 +0200
Branches: master
https://developer.blender.org/rB52655f51619d0ab06bbde6966c31d15f6ab4ab19

Cleanup: flag checks

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

M       source/blender/compositor/intern/COM_compositor.cpp
M       source/blender/editors/physics/physics_fluid.c

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

diff --git a/source/blender/compositor/intern/COM_compositor.cpp 
b/source/blender/compositor/intern/COM_compositor.cpp
index 4599832b433..ae9defa786e 100644
--- a/source/blender/compositor/intern/COM_compositor.cpp
+++ b/source/blender/compositor/intern/COM_compositor.cpp
@@ -88,7 +88,7 @@ void COM_execute(RenderData *rd, Scene *scene, bNodeTree 
*editingtree, int rende
        editingtree->progress(editingtree->prh, 0.0);
        editingtree->stats_draw(editingtree->sdh, IFACE_("Compositing"));
 
-       bool twopass = (editingtree->flag & NTREE_TWO_PASS) > 0 && !rendering;
+       bool twopass = (editingtree->flag & NTREE_TWO_PASS) && !rendering;
        /* initialize execution system */
        if (twopass) {
                ExecutionSystem *system = new ExecutionSystem(rd, scene, 
editingtree, rendering, twopass, viewSettings, displaySettings, viewName);
diff --git a/source/blender/editors/physics/physics_fluid.c 
b/source/blender/editors/physics/physics_fluid.c
index c76c04c1e99..1cd2528b3ca 100644
--- a/source/blender/editors/physics/physics_fluid.c
+++ b/source/blender/editors/physics/physics_fluid.c
@@ -430,7 +430,7 @@ static void fluid_init_all_channels(bContext *C, Object 
*UNUSED(fsDomain), Fluid
                for (fobj=fobjects->first; fobj; fobj=fobj->next) {
                        Object *ob = fobj->object;
                        FluidsimModifierData *fluidmd = (FluidsimModifierData 
*)modifiers_findByType(ob, eModifierType_Fluidsim);
-                       float active= (float) ((fluidmd->fss->flag & 
OB_FLUIDSIM_ACTIVE) > 0 ? 1 : 0);
+                       float active = (float) ((fluidmd->fss->flag & 
OB_FLUIDSIM_ACTIVE) ? 1 : 0);
                        float rot_d[3] = {0.f, 0.f, 0.f}, old_rot[3] = {0.f, 
0.f, 0.f};
 
                        if (ELEM(fluidmd->fss->type, OB_FLUIDSIM_DOMAIN, 
OB_FLUIDSIM_PARTICLE))

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