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-10-24 17:43:32 +0400
committerJeroen Bakker <j.bakker@atmind.nl>2012-10-24 17:43:32 +0400
commita49b1d7b5eaa02ea3caf90c9060e1326dec5f2e5 (patch)
treee4e2a414f8945678bd7d9be5743ff63b6520fbe2 /source/blender/compositor/nodes/COM_PixelateNode.cpp
parentf746f3ea0917033ee05c0282d177a466948927a6 (diff)
Oeps... Enabled the pixelate node added documentation, removed unneeded
code
Diffstat (limited to 'source/blender/compositor/nodes/COM_PixelateNode.cpp')
-rw-r--r--source/blender/compositor/nodes/COM_PixelateNode.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/compositor/nodes/COM_PixelateNode.cpp b/source/blender/compositor/nodes/COM_PixelateNode.cpp
index 6accc0d5ead..f1c7c616a30 100644
--- a/source/blender/compositor/nodes/COM_PixelateNode.cpp
+++ b/source/blender/compositor/nodes/COM_PixelateNode.cpp
@@ -34,8 +34,14 @@ void PixelateNode::convertToOperations(ExecutionSystem *graph, CompositorContext
{
InputSocket *inputSocket = this->getInputSocket(0);
OutputSocket *outputSocket = this->getOutputSocket(0);
+ DataType datatype = inputSocket->getDataType();
+ if (inputSocket->isConnected()) {
+ SocketConnection * connection = inputSocket->getConnection();
+ OutputSocket* otherOutputSocket = connection->getFromSocket();
+ datatype = otherOutputSocket->getDataType();
+ }
- PixelateOperation *operation = new PixelateOperation(inputSocket->getDataType());
+ PixelateOperation *operation = new PixelateOperation(datatype);
inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph);
outputSocket->relinkConnections(operation->getOutputSocket(0));
graph->addOperation(operation);