Blender Git Loki
Git Commits -> Revision c84b187
Revision c84b187 by Sergey Sharybin (master) September 5, 2013, 09:39 (GMT) |
Merge some operations into a single file This merges all mix operations into a COM_MixBaseOperation (naming could be better, but this way it corresponds to what's going on with math operations. Same was done with RenderLayers operations. Overall this gives 20% of bf_compositor library compilation time decrease. And it was rather annoying to have tens of files with just a single-line constructors anyway. TODO: - All Convert operations could also be merged into a single file, but that would require adding some ConvertBaseOperation to reduce code duplication (ideally). Leaving it unchanged for now. - Some operations' headers seems to be wrongly including MixOperation header, they need to include NodeOperation instead it seems. This is rather harmless, but would be nice to doublecheck on this eventually. |
Commit Details:
Full Hash: c84b18790d220d9468aa817e78c16088bb0de57d
SVN Revision: 59820
Parent Commit: 890caff
Lines Changed: +1619, -3875
4 Added Paths:
/source/blender/compositor/operations/COM_MixOperation.cpp (+848, -0) (View)
/source/blender/compositor/operations/COM_MixOperation.h (+197, -0) (View)
/source/blender/compositor/operations/COM_RenderLayersProg.cpp (+340, -0) (View)
/source/blender/compositor/operations/COM_RenderLayersProg.h (+208, -0) (View)
/source/blender/compositor/operations/COM_MixOperation.h (+197, -0) (View)
/source/blender/compositor/operations/COM_RenderLayersProg.cpp (+340, -0) (View)
/source/blender/compositor/operations/COM_RenderLayersProg.h (+208, -0) (View)
82 Deleted Paths:
/source/blender/compositor/operations/COM_MixAddOperation.cpp (+0, -51)
/source/blender/compositor/operations/COM_MixAddOperation.h (+0, -45)
/source/blender/compositor/operations/COM_MixBaseOperation.cpp (+0, -95)
/source/blender/compositor/operations/COM_MixBaseOperation.h (+0, -81)
/source/blender/compositor/operations/COM_MixBlendOperation.cpp (+0, -52)
/source/blender/compositor/operations/COM_MixBlendOperation.h (+0, -45)
/source/blender/compositor/operations/COM_MixBurnOperation.cpp (+0, -90)
/source/blender/compositor/operations/COM_MixBurnOperation.h (+0, -45)
/source/blender/compositor/operations/COM_MixColorOperation.cpp (+0, -68)
/source/blender/compositor/operations/COM_MixColorOperation.h (+0, -45)
/source/blender/compositor/operations/COM_MixDarkenOperation.cpp (+0, -60)
/source/blender/compositor/operations/COM_MixDarkenOperation.h (+0, -45)
/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp (+0, -53)
/source/blender/compositor/operations/COM_MixDifferenceOperation.h (+0, -45)
/source/blender/compositor/operations/COM_MixDivideOperation.cpp (+0, -63)
/source/blender/compositor/operations/COM_MixDivideOperation.h (+0, -45)
/source/blender/compositor/operations/COM_MixDodgeOperation.cpp (+0, -95)
/source/blender/compositor/operations/COM_MixDodgeOperation.h (+0, -45)
/source/blender/compositor/operations/COM_MixGlareOperation.cpp (+0, -53)
/source/blender/compositor/operations/COM_MixGlareOperation.h (+0, -45)
/source/blender/compositor/operations/COM_MixHueOperation.cpp (+0, -67)
/source/blender/compositor/operations/COM_MixHueOperation.h (+0, -45)
/source/blender/compositor/operations/COM_MixLightenOperation.cpp (+0, -58)
/source/blender/compositor/operations/COM_MixLightenOperation.h (+0, -44)
/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp (+0, -60)
/source/blender/compositor/operations/COM_MixLinearLightOperation.h (+0, -45)
/source/blender/compositor/operations/COM_MixMultiplyOperation.cpp (+0, -52)
/source/blender/compositor/operations/COM_MixMultiplyOperation.h (+0, -45)
/source/blender/compositor/operations/COM_MixOverlayOperation.cpp (+0, -69)
/source/blender/compositor/operations/COM_MixOverlayOperation.h (+0, -45)
/source/blender/compositor/operations/COM_MixSaturationOperation.cpp (+0, -64)
/source/blender/compositor/operations/COM_MixSaturationOperation.h (+0, -45)
/source/blender/compositor/operations/COM_MixScreenOperation.cpp (+0, -53)
/source/blender/compositor/operations/COM_MixScreenOperation.h (+0, -44)
/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp (+0, -59)
/source/blender/compositor/operations/COM_MixSoftLightOperation.h (+0, -45)
/source/blender/compositor/operations/COM_MixSubtractOperation.cpp (+0, -51)
/source/blender/compositor/operations/COM_MixSubtractOperation.h (+0, -45)
/source/blender/compositor/operations/COM_MixValueOperation.cpp (+0, -58)
/source/blender/compositor/operations/COM_MixValueOperation.h (+0, -44)
/source/blender/compositor/operations/COM_RenderLayersAlphaProg.cpp (+0, -49)
/source/blender/compositor/operations/COM_RenderLayersAlphaProg.h (+0, -35)
/source/blender/compositor/operations/COM_RenderLayersAOOperation.cpp (+0, -29)
/source/blender/compositor/operations/COM_RenderLayersAOOperation.h (+0, -33)
/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp (+0, -178)
/source/blender/compositor/operations/COM_RenderLayersBaseProg.h (+0, -105)
/source/blender/compositor/operations/COM_RenderLayersColorOperation.cpp (+0, -28)
/source/blender/compositor/operations/COM_RenderLayersColorOperation.h (+0, -33)
/source/blender/compositor/operations/COM_RenderLayersCyclesOperation.cpp (+0, -28)
/source/blender/compositor/operations/COM_RenderLayersCyclesOperation.h (+0, -33)
/source/blender/compositor/operations/COM_RenderLayersDepthProg.cpp (+0, -29)
/source/blender/compositor/operations/COM_RenderLayersDepthProg.h (+0, -34)
/source/blender/compositor/operations/COM_RenderLayersDiffuseOperation.cpp (+0, -28)
/source/blender/compositor/operations/COM_RenderLayersDiffuseOperation.h (+0, -33)
/source/blender/compositor/operations/COM_RenderLayersEmitOperation.cpp (+0, -28)
/source/blender/compositor/operations/COM_RenderLayersEmitOperation.h (+0, -33)
/source/blender/compositor/operations/COM_RenderLayersEnvironmentOperation.cpp (+0, -28)
/source/blender/compositor/operations/COM_RenderLayersEnvironmentOperation.h (+0, -33)
/source/blender/compositor/operations/COM_RenderLayersImageProg.cpp (+0, -28)
/source/blender/compositor/operations/COM_RenderLayersImageProg.h (+0, -34)
/source/blender/compositor/operations/COM_RenderLayersIndirectOperation.cpp (+0, -28)
/source/blender/compositor/operations/COM_RenderLayersIndirectOperation.h (+0, -33)
/source/blender/compositor/operations/COM_RenderLayersMaterialIndexOperation.cpp (+0, -28)
/source/blender/compositor/operations/COM_RenderLayersMaterialIndexOperation.h (+0, -33)
/source/blender/compositor/operations/COM_RenderLayersMistOperation.cpp (+0, -28)
/source/blender/compositor/operations/COM_RenderLayersMistOperation.h (+0, -33)
/source/blender/compositor/operations/COM_RenderLayersNormalOperation.cpp (+0, -28)
/source/blender/compositor/operations/COM_RenderLayersNormalOperation.h (+0, -33)
/source/blender/compositor/operations/COM_RenderLayersObjectIndexOperation.cpp (+0, -28)
/source/blender/compositor/operations/COM_RenderLayersObjectIndexOperation.h (+0, -33)
/source/blender/compositor/operations/COM_RenderLayersReflectionOperation.cpp (+0, -28)
/source/blender/compositor/operations/COM_RenderLayersReflectionOperation.h (+0, -33)
/source/blender/compositor/operations/COM_RenderLayersRefractionOperation.cpp (+0, -28)
/source/blender/compositor/operations/COM_RenderLayersRefractionOperation.h (+0, -33)
/source/blender/compositor/operations/COM_RenderLayersShadowOperation.cpp (+0, -28)
/source/blender/compositor/operations/COM_RenderLayersShadowOperation.h (+0, -33)
/source/blender/compositor/operations/COM_RenderLayersSpecularOperation.cpp (+0, -28)
/source/blender/compositor/operations/COM_RenderLayersSpecularOperation.h (+0, -33)
/source/blender/compositor/operations/COM_RenderLayersSpeedOperation.cpp (+0, -28)
/source/blender/compositor/operations/COM_RenderLayersSpeedOperation.h (+0, -33)
/source/blender/compositor/operations/COM_RenderLayersUVOperation.cpp (+0, -28)
/source/blender/compositor/operations/COM_RenderLayersUVOperation.h (+0, -33)
/source/blender/compositor/operations/COM_MixAddOperation.h (+0, -45)
/source/blender/compositor/operations/COM_MixBaseOperation.cpp (+0, -95)
/source/blender/compositor/operations/COM_MixBaseOperation.h (+0, -81)
/source/blender/compositor/operations/COM_MixBlendOperation.cpp (+0, -52)
/source/blender/compositor/operations/COM_MixBlendOperation.h (+0, -45)
/source/blender/compositor/operations/COM_MixBurnOperation.cpp (+0, -90)
/source/blender/compositor/operations/COM_MixBurnOperation.h (+0, -45)
/source/blender/compositor/operations/COM_MixColorOperation.cpp (+0, -68)
/source/blender/compositor/operations/COM_MixColorOperation.h (+0, -45)
/source/blender/compositor/operations/COM_MixDarkenOperation.cpp (+0, -60)
/source/blender/compositor/operations/COM_MixDarkenOperation.h (+0, -45)
/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp (+0, -53)
/source/blender/compositor/operations/COM_MixDifferenceOperation.h (+0, -45)
/source/blender/compositor/operations/COM_MixDivideOperation.cpp (+0, -63)
/source/blender/compositor/operations/COM_MixDivideOperation.h (+0, -45)
/source/blender/compositor/operations/COM_MixDodgeOperation.cpp (+0, -95)
/source/blender/compositor/operations/COM_MixDodgeOperation.h (+0, -45)
/source/blender/compositor/operations/COM_MixGlareOperation.cpp (+0, -53)
/source/blender/compositor/operations/COM_MixGlareOperation.h (+0, -45)
/source/blender/compositor/operations/COM_MixHueOperation.cpp (+0, -67)
/source/blender/compositor/operations/COM_MixHueOperation.h (+0, -45)
/source/blender/compositor/operations/COM_MixLightenOperation.cpp (+0, -58)
/source/blender/compositor/operations/COM_MixLightenOperation.h (+0, -44)
/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp (+0, -60)
/source/blender/compositor/operations/COM_MixLinearLightOperation.h (+0, -45)
/source/blender/compositor/operations/COM_MixMultiplyOperation.cpp (+0, -52)
/source/blender/compositor/operations/COM_MixMultiplyOperation.h (+0, -45)
/source/blender/compositor/operations/COM_MixOverlayOperation.cpp (+0, -69)
/source/blender/compositor/operations/COM_MixOverlayOperation.h (+0, -45)
/source/blender/compositor/operations/COM_MixSaturationOperation.cpp (+0, -64)
/source/blender/compositor/operations/COM_MixSaturationOperation.h (+0, -45)
/source/blender/compositor/operations/COM_MixScreenOperation.cpp (+0, -53)
/source/blender/compositor/operations/COM_MixScreenOperation.h (+0, -44)
/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp (+0, -59)
/source/blender/compositor/operations/COM_MixSoftLightOperation.h (+0, -45)
/source/blender/compositor/operations/COM_MixSubtractOperation.cpp (+0, -51)
/source/blender/compositor/operations/COM_MixSubtractOperation.h (+0, -45)
/source/blender/compositor/operations/COM_MixValueOperation.cpp (+0, -58)
/source/blender/compositor/operations/COM_MixValueOperation.h (+0, -44)
/source/blender/compositor/operations/COM_RenderLayersAlphaProg.cpp (+0, -49)
/source/blender/compositor/operations/COM_RenderLayersAlphaProg.h (+0, -35)
/source/blender/compositor/operations/COM_RenderLayersAOOperation.cpp (+0, -29)
/source/blender/compositor/operations/COM_RenderLayersAOOperation.h (+0, -33)
/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp (+0, -178)
/source/blender/compositor/operations/COM_RenderLayersBaseProg.h (+0, -105)
/source/blender/compositor/operations/COM_RenderLayersColorOperation.cpp (+0, -28)
/source/blender/compositor/operations/COM_RenderLayersColorOperation.h (+0, -33)
/source/blender/compositor/operations/COM_RenderLayersCyclesOperation.cpp (+0, -28)
/source/blender/compositor/operations/COM_RenderLayersCyclesOperation.h (+0, -33)
/source/blender/compositor/operations/COM_RenderLayersDepthProg.cpp (+0, -29)
/source/blender/compositor/operations/COM_RenderLayersDepthProg.h (+0, -34)
/source/blender/compositor/operations/COM_RenderLayersDiffuseOperation.cpp (+0, -28)
/source/blender/compositor/operations/COM_RenderLayersDiffuseOperation.h (+0, -33)
/source/blender/compositor/operations/COM_RenderLayersEmitOperation.cpp (+0, -28)
/source/blender/compositor/operations/COM_RenderLayersEmitOperation.h (+0, -33)
/source/blender/compositor/operations/COM_RenderLayersEnvironmentOperation.cpp (+0, -28)
/source/blender/compositor/operations/COM_RenderLayersEnvironmentOperation.h (+0, -33)
/source/blender/compositor/operations/COM_RenderLayersImageProg.cpp (+0, -28)
/source/blender/compositor/operations/COM_RenderLayersImageProg.h (+0, -34)
/source/blender/compositor/operations/COM_RenderLayersIndirectOperation.cpp (+0, -28)
/source/blender/compositor/operations/COM_RenderLayersIndirectOperation.h (+0, -33)
/source/blender/compositor/operations/COM_RenderLayersMaterialIndexOperation.cpp (+0, -28)
/source/blender/compositor/operations/COM_RenderLayersMaterialIndexOperation.h (+0, -33)
/source/blender/compositor/operations/COM_RenderLayersMistOperation.cpp (+0, -28)
/source/blender/compositor/operations/COM_RenderLayersMistOperation.h (+0, -33)
/source/blender/compositor/operations/COM_RenderLayersNormalOperation.cpp (+0, -28)
/source/blender/compositor/operations/COM_RenderLayersNormalOperation.h (+0, -33)
/source/blender/compositor/operations/COM_RenderLayersObjectIndexOperation.cpp (+0, -28)
/source/blender/compositor/operations/COM_RenderLayersObjectIndexOperation.h (+0, -33)
/source/blender/compositor/operations/COM_RenderLayersReflectionOperation.cpp (+0, -28)
/source/blender/compositor/operations/COM_RenderLayersReflectionOperation.h (+0, -33)
/source/blender/compositor/operations/COM_RenderLayersRefractionOperation.cpp (+0, -28)
/source/blender/compositor/operations/COM_RenderLayersRefractionOperation.h (+0, -33)
/source/blender/compositor/operations/COM_RenderLayersShadowOperation.cpp (+0, -28)
/source/blender/compositor/operations/COM_RenderLayersShadowOperation.h (+0, -33)
/source/blender/compositor/operations/COM_RenderLayersSpecularOperation.cpp (+0, -28)
/source/blender/compositor/operations/COM_RenderLayersSpecularOperation.h (+0, -33)
/source/blender/compositor/operations/COM_RenderLayersSpeedOperation.cpp (+0, -28)
/source/blender/compositor/operations/COM_RenderLayersSpeedOperation.h (+0, -33)
/source/blender/compositor/operations/COM_RenderLayersUVOperation.cpp (+0, -28)
/source/blender/compositor/operations/COM_RenderLayersUVOperation.h (+0, -33)
23 Modified Paths:
/source/blender/compositor/CMakeLists.txt (+4, -83) (Diff)
/source/blender/compositor/nodes/COM_AlphaOverNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_FilterNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_GlareNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_MixNode.cpp (+1, -18) (Diff)
/source/blender/compositor/nodes/COM_RenderLayersNode.cpp (+1, -20) (Diff)
/source/blender/compositor/nodes/COM_RenderLayersNode.h (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_ZCombineNode.cpp (+1, -1) (Diff)
/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h (+1, -1) (Diff)
/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h (+1, -1) (Diff)
/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h (+1, -1) (Diff)
/source/blender/compositor/operations/COM_ChangeHSVOperation.h (+1, -1) (Diff)
/source/blender/compositor/operations/COM_ChannelMatteOperation.h (+1, -1) (Diff)
/source/blender/compositor/operations/COM_ChromaMatteOperation.h (+1, -1) (Diff)
/source/blender/compositor/operations/COM_ColorMatteOperation.h (+1, -1) (Diff)
/source/blender/compositor/operations/COM_DifferenceMatteOperation.h (+1, -1) (Diff)
/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.h (+1, -1) (Diff)
/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h (+1, -1) (Diff)
/source/blender/compositor/operations/COM_LuminanceMatteOperation.h (+1, -1) (Diff)
/source/blender/compositor/operations/COM_ZCombineOperation.h (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_AlphaOverNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_FilterNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_GlareNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_MixNode.cpp (+1, -18) (Diff)
/source/blender/compositor/nodes/COM_RenderLayersNode.cpp (+1, -20) (Diff)
/source/blender/compositor/nodes/COM_RenderLayersNode.h (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_ZCombineNode.cpp (+1, -1) (Diff)
/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h (+1, -1) (Diff)
/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h (+1, -1) (Diff)
/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h (+1, -1) (Diff)
/source/blender/compositor/operations/COM_ChangeHSVOperation.h (+1, -1) (Diff)
/source/blender/compositor/operations/COM_ChannelMatteOperation.h (+1, -1) (Diff)
/source/blender/compositor/operations/COM_ChromaMatteOperation.h (+1, -1) (Diff)
/source/blender/compositor/operations/COM_ColorMatteOperation.h (+1, -1) (Diff)
/source/blender/compositor/operations/COM_DifferenceMatteOperation.h (+1, -1) (Diff)
/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.h (+1, -1) (Diff)
/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h (+1, -1) (Diff)
/source/blender/compositor/operations/COM_LuminanceMatteOperation.h (+1, -1) (Diff)
/source/blender/compositor/operations/COM_ZCombineOperation.h (+1, -1) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021