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/intern/COM_Converter.cpp | |
| parent | ee65cd7685f3a2334bf47dbfeff5f0d576e082fd (diff) | |
Removed the actual data type concept as it was never used.
Diffstat (limited to 'source/blender/compositor/intern/COM_Converter.cpp')
| -rw-r--r-- | source/blender/compositor/intern/COM_Converter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/compositor/intern/COM_Converter.cpp b/source/blender/compositor/intern/COM_Converter.cpp index dc6409e7b86..f4bb89969ff 100644 --- a/source/blender/compositor/intern/COM_Converter.cpp +++ b/source/blender/compositor/intern/COM_Converter.cpp @@ -362,8 +362,8 @@ void Converter::convertDataType(SocketConnection *connection, ExecutionSystem *s { OutputSocket *outputSocket = connection->getFromSocket(); InputSocket *inputSocket = connection->getToSocket(); - DataType fromDatatype = outputSocket->getActualDataType(); - DataType toDatatype = inputSocket->getActualDataType(); + DataType fromDatatype = outputSocket->getDataType(); + DataType toDatatype = inputSocket->getDataType(); NodeOperation * converter = NULL; if (fromDatatype == COM_DT_VALUE && toDatatype == COM_DT_COLOR) { converter = new ConvertValueToColourProg(); |