Blender Git Loki
Git Commits -> Revision 028371c
Revision 028371c by Lukas Toenne (master) September 5, 2013, 13:32 (GMT) |
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). |
Commit Details:
Full Hash: 028371c174189278dd30e3c7f5a2b4a50910fd77
SVN Revision: 59837
Parent Commit: bed447b
Lines Changed: +657, -1941
2 Added Paths:
/source/blender/compositor/operations/COM_ConvertOperation.cpp (+429, -0) (View)
/source/blender/compositor/operations/COM_ConvertOperation.h (+202, -0) (View)
/source/blender/compositor/operations/COM_ConvertOperation.h (+202, -0) (View)
34 Deleted Paths:
/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp (+0, -76)
/source/blender/compositor/operations/COM_CombineChannelsOperation.h (+0, -42)
/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp (+0, -47)
/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h (+0, -60)
/source/blender/compositor/operations/COM_ConvertColorToValueProg.cpp (+0, -47)
/source/blender/compositor/operations/COM_ConvertColorToValueProg.h (+0, -59)
/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.cpp (+0, -45)
/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h (+0, -59)
/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.cpp (+0, -50)
/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h (+0, -59)
/source/blender/compositor/operations/COM_ConvertPremulToStraightOperation.cpp (+0, -60)
/source/blender/compositor/operations/COM_ConvertPremulToStraightOperation.h (+0, -48)
/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.cpp (+0, -49)
/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h (+0, -60)
/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.cpp (+0, -70)
/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h (+0, -68)
/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.cpp (+0, -48)
/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h (+0, -59)
/source/blender/compositor/operations/COM_ConvertStraightToPremulOperation.cpp (+0, -55)
/source/blender/compositor/operations/COM_ConvertStraightToPremulOperation.h (+0, -49)
/source/blender/compositor/operations/COM_ConvertValueToColorProg.cpp (+0, -47)
/source/blender/compositor/operations/COM_ConvertValueToColorProg.h (+0, -53)
/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.cpp (+0, -50)
/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h (+0, -59)
/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.cpp (+0, -46)
/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h (+0, -59)
/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.cpp (+0, -47)
/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h (+0, -59)
/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.cpp (+0, -70)
/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h (+0, -68)
/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.cpp (+0, -49)
/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h (+0, -58)
/source/blender/compositor/operations/COM_SeparateChannelOperation.cpp (+0, -47)
/source/blender/compositor/operations/COM_SeparateChannelOperation.h (+0, -42)
/source/blender/compositor/operations/COM_CombineChannelsOperation.h (+0, -42)
/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp (+0, -47)
/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h (+0, -60)
/source/blender/compositor/operations/COM_ConvertColorToValueProg.cpp (+0, -47)
/source/blender/compositor/operations/COM_ConvertColorToValueProg.h (+0, -59)
/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.cpp (+0, -45)
/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h (+0, -59)
/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.cpp (+0, -50)
/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h (+0, -59)
/source/blender/compositor/operations/COM_ConvertPremulToStraightOperation.cpp (+0, -60)
/source/blender/compositor/operations/COM_ConvertPremulToStraightOperation.h (+0, -48)
/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.cpp (+0, -49)
/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h (+0, -60)
/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.cpp (+0, -70)
/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h (+0, -68)
/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.cpp (+0, -48)
/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h (+0, -59)
/source/blender/compositor/operations/COM_ConvertStraightToPremulOperation.cpp (+0, -55)
/source/blender/compositor/operations/COM_ConvertStraightToPremulOperation.h (+0, -49)
/source/blender/compositor/operations/COM_ConvertValueToColorProg.cpp (+0, -47)
/source/blender/compositor/operations/COM_ConvertValueToColorProg.h (+0, -53)
/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.cpp (+0, -50)
/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h (+0, -59)
/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.cpp (+0, -46)
/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h (+0, -59)
/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.cpp (+0, -47)
/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h (+0, -59)
/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.cpp (+0, -70)
/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h (+0, -68)
/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.cpp (+0, -49)
/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h (+0, -58)
/source/blender/compositor/operations/COM_SeparateChannelOperation.cpp (+0, -47)
/source/blender/compositor/operations/COM_SeparateChannelOperation.h (+0, -42)
22 Modified Paths:
/source/blender/compositor/CMakeLists.txt (+2, -35) (Diff)
/source/blender/compositor/intern/COM_Converter.cpp (+3, -8) (Diff)
/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp (+1, -3) (Diff)
/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_ColorMatteNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_ColorRampNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_ColorToBWNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_CombineHSVANode.cpp (+2, -2) (Diff)
/source/blender/compositor/nodes/COM_CombineRGBANode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_CombineYCCANode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_CombineYUVANode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp (+1, -2) (Diff)
/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp (+1, -3) (Diff)
/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp (+1, -3) (Diff)
/source/blender/compositor/nodes/COM_ImageNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_KeyingNode.cpp (+1, -4) (Diff)
/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_SeparateHSVANode.cpp (+1, -2) (Diff)
/source/blender/compositor/nodes/COM_SeparateRGBANode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_SeparateYCCANode.cpp (+1, -2) (Diff)
/source/blender/compositor/nodes/COM_SeparateYUVANode.cpp (+1, -2) (Diff)
/source/blender/compositor/intern/COM_Converter.cpp (+3, -8) (Diff)
/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp (+1, -3) (Diff)
/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_ColorMatteNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_ColorRampNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_ColorToBWNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_CombineHSVANode.cpp (+2, -2) (Diff)
/source/blender/compositor/nodes/COM_CombineRGBANode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_CombineYCCANode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_CombineYUVANode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp (+1, -2) (Diff)
/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp (+1, -3) (Diff)
/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp (+1, -3) (Diff)
/source/blender/compositor/nodes/COM_ImageNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_KeyingNode.cpp (+1, -4) (Diff)
/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_SeparateHSVANode.cpp (+1, -2) (Diff)
/source/blender/compositor/nodes/COM_SeparateRGBANode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_SeparateYCCANode.cpp (+1, -2) (Diff)
/source/blender/compositor/nodes/COM_SeparateYUVANode.cpp (+1, -2) (Diff)