Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-02-10 17:14:51 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-02-10 17:14:51 +0400
commit9a6c5d8b3ef2e2ddd444d79c384bea0eeffca71f (patch)
tree40f1cdd7932e541e987f1d23001ac5db05ebc6e2 /source/blender/compositor/nodes/COM_CompositorNode.cpp
parent75cbb07507fa39a1c65296321839cdfd245cc8d6 (diff)
We've reconsidered previous patch in IRC.
It's more useful to completely ignore alpha for display of straight colors. Supporting straight pipeline is possible, but not a topic for bcon4.
Diffstat (limited to 'source/blender/compositor/nodes/COM_CompositorNode.cpp')
-rw-r--r--source/blender/compositor/nodes/COM_CompositorNode.cpp2
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 e5c01c7573a..fc4dea8cee3 100644
--- a/source/blender/compositor/nodes/COM_CompositorNode.cpp
+++ b/source/blender/compositor/nodes/COM_CompositorNode.cpp
@@ -41,7 +41,7 @@ void CompositorNode::convertToOperations(ExecutionSystem *graph, CompositorConte
compositorOperation->setSceneName(editorNode->id->name);
compositorOperation->setRenderData(context->getRenderData());
compositorOperation->setbNodeTree(context->getbNodeTree());
- compositorOperation->setStraightAlpha(editorNode->custom2 & 1);
+ compositorOperation->setIgnoreAlpha(editorNode->custom2 & 1);
imageSocket->relinkConnections(compositorOperation->getInputSocket(0), 0, graph);
alphaSocket->relinkConnections(compositorOperation->getInputSocket(1));
depthSocket->relinkConnections(compositorOperation->getInputSocket(2));