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:
authorJeroen Bakker <j.bakker@atmind.nl>2012-07-29 19:06:50 +0400
committerJeroen Bakker <j.bakker@atmind.nl>2012-07-29 19:06:50 +0400
commit93ff6f6dff73cf24e591dd2678ee601495714dc7 (patch)
treefb91d285b1400d26e36ad4d190aa87009c19d6a1 /source/blender/compositor/nodes/COM_CompositorNode.cpp
parent4ef8f3f537c7d3c10307cd7e6e1f01d644176914 (diff)
Support for depth buffers in compositor and viewer node
Support for only alpha images in compositor and viewer node
Diffstat (limited to 'source/blender/compositor/nodes/COM_CompositorNode.cpp')
-rw-r--r--source/blender/compositor/nodes/COM_CompositorNode.cpp19
1 files changed, 10 insertions, 9 deletions
diff --git a/source/blender/compositor/nodes/COM_CompositorNode.cpp b/source/blender/compositor/nodes/COM_CompositorNode.cpp
index 28e466203c4..8a84908f478 100644
--- a/source/blender/compositor/nodes/COM_CompositorNode.cpp
+++ b/source/blender/compositor/nodes/COM_CompositorNode.cpp
@@ -33,13 +33,14 @@ void CompositorNode::convertToOperations(ExecutionSystem *graph, CompositorConte
{
InputSocket *imageSocket = this->getInputSocket(0);
InputSocket *alphaSocket = this->getInputSocket(1);
- if (imageSocket->isConnected()) {
- CompositorOperation *colorAlphaProg = new CompositorOperation();
- colorAlphaProg->setRenderData(context->getRenderData());
- colorAlphaProg->setbNodeTree(context->getbNodeTree());
- imageSocket->relinkConnections(colorAlphaProg->getInputSocket(0));
- alphaSocket->relinkConnections(colorAlphaProg->getInputSocket(1));
- graph->addOperation(colorAlphaProg);
- addPreviewOperation(graph, colorAlphaProg->getInputSocket(0));
- }
+ InputSocket *depthSocket = this->getInputSocket(2);
+
+ CompositorOperation *compositorOperation = new CompositorOperation();
+ compositorOperation->setRenderData(context->getRenderData());
+ compositorOperation->setbNodeTree(context->getbNodeTree());
+ imageSocket->relinkConnections(compositorOperation->getInputSocket(0), 0, graph);
+ alphaSocket->relinkConnections(compositorOperation->getInputSocket(1));
+ depthSocket->relinkConnections(compositorOperation->getInputSocket(2));
+ graph->addOperation(compositorOperation);
+ addPreviewOperation(graph, compositorOperation->getInputSocket(0));
}