diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-01-07 03:41:45 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-01-07 04:08:55 +0300 |
| commit | 29d2c71117809fea3c9d11a872e422b85847d93b (patch) | |
| tree | a30d561e7d95d5c5e307c00d7de98372a8ef5406 /source/blender/compositor/nodes | |
| parent | 848c00f7e70950fa012627f84c89b32bb9a4deaa (diff) | |
Fix for bool flag use
Diffstat (limited to 'source/blender/compositor/nodes')
| -rw-r--r-- | source/blender/compositor/nodes/COM_CompositorNode.cpp | 2 | ||||
| -rw-r--r-- | source/blender/compositor/nodes/COM_MixNode.cpp | 4 | ||||
| -rw-r--r-- | source/blender/compositor/nodes/COM_ViewerNode.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/compositor/nodes/COM_CompositorNode.cpp b/source/blender/compositor/nodes/COM_CompositorNode.cpp index 3d79eb693ea..933b8d0282b 100644 --- a/source/blender/compositor/nodes/COM_CompositorNode.cpp +++ b/source/blender/compositor/nodes/COM_CompositorNode.cpp @@ -34,7 +34,7 @@ void CompositorNode::convertToOperations(NodeConverter &converter, const Composi bNode *editorNode = this->getbNode(); bool is_active = (editorNode->flag & NODE_DO_OUTPUT_RECALC) || context.isRendering(); - bool ignore_alpha = editorNode->custom2 & CMP_NODE_OUTPUT_IGNORE_ALPHA; + bool ignore_alpha = (editorNode->custom2 & CMP_NODE_OUTPUT_IGNORE_ALPHA) != 0; NodeInput *imageSocket = this->getInputSocket(0); NodeInput *alphaSocket = this->getInputSocket(1); diff --git a/source/blender/compositor/nodes/COM_MixNode.cpp b/source/blender/compositor/nodes/COM_MixNode.cpp index b12dfc02ed7..89010d0e861 100644 --- a/source/blender/compositor/nodes/COM_MixNode.cpp +++ b/source/blender/compositor/nodes/COM_MixNode.cpp @@ -41,8 +41,8 @@ void MixNode::convertToOperations(NodeConverter &converter, const CompositorCont NodeInput *color2Socket = this->getInputSocket(2); NodeOutput *outputSocket = this->getOutputSocket(0); bNode *editorNode = this->getbNode(); - bool useAlphaPremultiply = this->getbNode()->custom2 & 1; - bool useClamp = this->getbNode()->custom2 & 2; + bool useAlphaPremultiply = (this->getbNode()->custom2 & 1) != 0; + bool useClamp = (this->getbNode()->custom2 & 2) != 0; MixBaseOperation *convertProg; switch (editorNode->custom1) { diff --git a/source/blender/compositor/nodes/COM_ViewerNode.cpp b/source/blender/compositor/nodes/COM_ViewerNode.cpp index 07aa960c4d9..ff0b8fb1706 100644 --- a/source/blender/compositor/nodes/COM_ViewerNode.cpp +++ b/source/blender/compositor/nodes/COM_ViewerNode.cpp @@ -35,7 +35,7 @@ void ViewerNode::convertToOperations(NodeConverter &converter, const CompositorC { bNode *editorNode = this->getbNode(); bool do_output = (editorNode->flag & NODE_DO_OUTPUT_RECALC || context.isRendering()) && (editorNode->flag & NODE_DO_OUTPUT); - bool ignore_alpha = editorNode->custom2 & CMP_NODE_OUTPUT_IGNORE_ALPHA; + bool ignore_alpha = (editorNode->custom2 & CMP_NODE_OUTPUT_IGNORE_ALPHA) != 0; NodeInput *imageSocket = this->getInputSocket(0); NodeInput *alphaSocket = this->getInputSocket(1); |