diff options
| author | Lukas Toenne <lukas.toenne@googlemail.com> | 2013-09-05 17:32:14 +0400 |
|---|---|---|
| committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2013-09-05 17:32:14 +0400 |
| commit | 028371c174189278dd30e3c7f5a2b4a50910fd77 (patch) | |
| tree | 4e6c263d404f8520570fb2c884192bd928db2f01 /source/blender/compositor/intern/COM_Converter.cpp | |
| parent | bed447b244ac949807baa27b61d00d45b547e5c9 (diff) | |
Compositor cleanup: Merge conversion operations into a single file (see also r59820).
Most convert operations can share a common base class with a single socket reader (except channel separate/combine nodes).
Diffstat (limited to 'source/blender/compositor/intern/COM_Converter.cpp')
| -rw-r--r-- | source/blender/compositor/intern/COM_Converter.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/source/blender/compositor/intern/COM_Converter.cpp b/source/blender/compositor/intern/COM_Converter.cpp index db0cdd1692e..384cfbe47fa 100644 --- a/source/blender/compositor/intern/COM_Converter.cpp +++ b/source/blender/compositor/intern/COM_Converter.cpp @@ -47,12 +47,7 @@ #include "COM_CombineYUVANode.h" #include "COM_CompositorNode.h" #include "COM_ConvertAlphaNode.h" -#include "COM_ConvertColorToVectorOperation.h" -#include "COM_ConvertColorToValueProg.h" -#include "COM_ConvertValueToColorProg.h" -#include "COM_ConvertValueToVectorOperation.h" -#include "COM_ConvertVectorToColorOperation.h" -#include "COM_ConvertVectorToValueOperation.h" +#include "COM_ConvertOperation.h" #include "COM_Converter.h" #include "COM_CropNode.h" #include "COM_DefocusNode.h" @@ -420,13 +415,13 @@ void Converter::convertDataType(SocketConnection *connection, ExecutionSystem *s DataType toDatatype = inputSocket->getDataType(); NodeOperation *converter = NULL; if (fromDatatype == COM_DT_VALUE && toDatatype == COM_DT_COLOR) { - converter = new ConvertValueToColorProg(); + converter = new ConvertValueToColorOperation(); } else if (fromDatatype == COM_DT_VALUE && toDatatype == COM_DT_VECTOR) { converter = new ConvertValueToVectorOperation(); } else if (fromDatatype == COM_DT_COLOR && toDatatype == COM_DT_VALUE) { - converter = new ConvertColorToValueProg(); + converter = new ConvertColorToValueOperation(); } else if (fromDatatype == COM_DT_COLOR && toDatatype == COM_DT_VECTOR) { converter = new ConvertColorToVectorOperation(); |