Merging r47874 through r47885 from trunk into soc-2011-tomato
[blender.git] / source / blender / compositor / intern / COM_Converter.cpp
index 92eb0f0f92c82c8757f1dc26e93b628e68f88597..9731555039ced05af0f2a06837a234b83165f4d3 100644 (file)
@@ -370,8 +370,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();