diff options
author | Roman Pogribnyi <pogribnyi@gmail.com> | 2015-03-15 21:57:06 +0300 |
---|---|---|
committer | Roman Pogribnyi <pogribnyi@gmail.com> | 2015-03-15 21:57:06 +0300 |
commit | 5c64aa25541b973db4ec90c97e30b02d09b00075 (patch) | |
tree | 0cd3a8912d8b0cbfc5fe0bb94a2a42751e98dcd6 /source/blender/compositor/nodes/COM_CompositorNode.cpp | |
parent | 2a1a6bc5720a4310e42a67754998e0480bf7c59b (diff) | |
parent | 225027ce5dea3785626908b58b01fb3959cf8362 (diff) |
Merge branch 'master' into soc-2014-fluid
Diffstat (limited to 'source/blender/compositor/nodes/COM_CompositorNode.cpp')
-rw-r--r-- | source/blender/compositor/nodes/COM_CompositorNode.cpp | 2 |
1 files changed, 1 insertions, 1 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); |