diff options
author | Jeroen Bakker <j.bakker@atmind.nl> | 2012-06-14 13:41:41 +0400 |
---|---|---|
committer | Jeroen Bakker <j.bakker@atmind.nl> | 2012-06-14 13:41:41 +0400 |
commit | 8ebec02df6e58fe02bd33c236601a3209f9818cd (patch) | |
tree | 2456049baf76cfbf707ec151d8a5f8c180164ef8 /source/blender/compositor/nodes/COM_SocketProxyNode.cpp | |
parent | ee65cd7685f3a2334bf47dbfeff5f0d576e082fd (diff) |
Removed the actual data type concept as it was never used.
Diffstat (limited to 'source/blender/compositor/nodes/COM_SocketProxyNode.cpp')
-rw-r--r-- | source/blender/compositor/nodes/COM_SocketProxyNode.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/compositor/nodes/COM_SocketProxyNode.cpp b/source/blender/compositor/nodes/COM_SocketProxyNode.cpp index fbb25afe266..cdb844cad54 100644 --- a/source/blender/compositor/nodes/COM_SocketProxyNode.cpp +++ b/source/blender/compositor/nodes/COM_SocketProxyNode.cpp @@ -49,14 +49,14 @@ void SocketProxyNode::convertToOperations(ExecutionSystem *graph, CompositorCont InputSocket * inputsocket = this->getInputSocket(0); if (outputsocket->isConnected()) { if (inputsocket->isConnected()) { - SocketProxyOperation *operation = new SocketProxyOperation(); + SocketProxyOperation *operation = new SocketProxyOperation(this->getOutputSocket()->getDataType()); inputsocket->relinkConnections(operation->getInputSocket(0)); outputsocket->relinkConnections(operation->getOutputSocket(0)); graph->addOperation(operation); } else { /* If input is not connected, add a constant value operation instead */ - switch (outputsocket->getActualDataType()) { + switch (outputsocket->getDataType()) { case COM_DT_VALUE: { SetValueOperation *operation = new SetValueOperation(); @@ -84,9 +84,6 @@ void SocketProxyNode::convertToOperations(ExecutionSystem *graph, CompositorCont graph->addOperation(operation); break; } - /* quiet warnings */ - case COM_DT_UNKNOWN: - break; } } } |