[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42303] branches/tile: New composite engine.
Jeroen Bakker
j.bakker at atmind.nl
Wed Nov 30 23:23:44 CET 2011
Revision: 42303
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42303
Author: jbakker
Date: 2011-11-30 22:23:40 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
New composite engine.
committed in order to start the migration of the nodes.
have some issues with some changes in trunk based on the UI event handlers.
sometimes an exception happens in the malloc of a UI-control.
need to discuss what the issue is.
OpenCL part is disabled right now. will be enabled in a folowing commit.
Jeroen & Monique.
- At Mind -
Modified Paths:
--------------
branches/tile/release/scripts/startup/bl_ui/space_node.py
branches/tile/source/blender/CMakeLists.txt
branches/tile/source/blender/SConscript
branches/tile/source/blender/blenkernel/BKE_node.h
branches/tile/source/blender/blenkernel/intern/node.c
branches/tile/source/blender/blenloader/intern/readfile.c
branches/tile/source/blender/editors/space_node/drawnode.c
branches/tile/source/blender/editors/space_node/node_edit.c
branches/tile/source/blender/makesdna/DNA_node_types.h
branches/tile/source/blender/makesrna/intern/rna_nodetree.c
branches/tile/source/blender/makesrna/intern/rna_nodetree_types.h
branches/tile/source/blender/nodes/CMakeLists.txt
branches/tile/source/blender/nodes/NOD_composite.h
branches/tile/source/blender/nodes/SConscript
branches/tile/source/blender/nodes/composite/node_composite_tree.c
branches/tile/source/blender/nodes/composite/nodes/node_composite_image.c
branches/tile/source/blender/nodes/composite/nodes/node_composite_viewer.c
branches/tile/source/creator/CMakeLists.txt
Added Paths:
-----------
branches/tile/source/blender/compositor/
branches/tile/source/blender/compositor/CMakeLists.txt
branches/tile/source/blender/compositor/COM_colorspace.h
branches/tile/source/blender/compositor/COM_compositor.h
branches/tile/source/blender/compositor/COM_defines.h
branches/tile/source/blender/compositor/SConscript
branches/tile/source/blender/compositor/intern/
branches/tile/source/blender/compositor/intern/COM_CPUDevice.cpp
branches/tile/source/blender/compositor/intern/COM_CPUDevice.h
branches/tile/source/blender/compositor/intern/COM_ChannelInfo.cpp
branches/tile/source/blender/compositor/intern/COM_ChannelInfo.h
branches/tile/source/blender/compositor/intern/COM_ChunkOrder.cpp
branches/tile/source/blender/compositor/intern/COM_ChunkOrder.h
branches/tile/source/blender/compositor/intern/COM_ChunkOrderHotspot.cpp
branches/tile/source/blender/compositor/intern/COM_ChunkOrderHotspot.h
branches/tile/source/blender/compositor/intern/COM_ColorSpaces.cpp.orig
branches/tile/source/blender/compositor/intern/COM_CompositorContext.cpp
branches/tile/source/blender/compositor/intern/COM_CompositorContext.h
branches/tile/source/blender/compositor/intern/COM_Converter.cpp
branches/tile/source/blender/compositor/intern/COM_Converter.h
branches/tile/source/blender/compositor/intern/COM_Device.cpp
branches/tile/source/blender/compositor/intern/COM_Device.h
branches/tile/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/tile/source/blender/compositor/intern/COM_ExecutionGroup.h
branches/tile/source/blender/compositor/intern/COM_ExecutionSystem.cpp
branches/tile/source/blender/compositor/intern/COM_ExecutionSystem.h
branches/tile/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
branches/tile/source/blender/compositor/intern/COM_ExecutionSystemHelper.h
branches/tile/source/blender/compositor/intern/COM_InputSocket.cpp
branches/tile/source/blender/compositor/intern/COM_InputSocket.h
branches/tile/source/blender/compositor/intern/COM_MemoryBuffer.cpp
branches/tile/source/blender/compositor/intern/COM_MemoryBuffer.h
branches/tile/source/blender/compositor/intern/COM_MemoryManager.cpp
branches/tile/source/blender/compositor/intern/COM_MemoryManager.h
branches/tile/source/blender/compositor/intern/COM_MemoryManagerState.cpp
branches/tile/source/blender/compositor/intern/COM_MemoryManagerState.h
branches/tile/source/blender/compositor/intern/COM_MemoryProxy.cpp
branches/tile/source/blender/compositor/intern/COM_MemoryProxy.h
branches/tile/source/blender/compositor/intern/COM_Node.cpp
branches/tile/source/blender/compositor/intern/COM_Node.h
branches/tile/source/blender/compositor/intern/COM_NodeBase.cpp
branches/tile/source/blender/compositor/intern/COM_NodeBase.h
branches/tile/source/blender/compositor/intern/COM_NodeOperation.cpp
branches/tile/source/blender/compositor/intern/COM_NodeOperation.h
branches/tile/source/blender/compositor/intern/COM_NodeProgram.cpp
branches/tile/source/blender/compositor/intern/COM_NodeProgram.h
branches/tile/source/blender/compositor/intern/COM_OpenCLDevice.cpp
branches/tile/source/blender/compositor/intern/COM_OpenCLDevice.h
branches/tile/source/blender/compositor/intern/COM_OutputSocket.cpp
branches/tile/source/blender/compositor/intern/COM_OutputSocket.h
branches/tile/source/blender/compositor/intern/COM_Socket.cpp
branches/tile/source/blender/compositor/intern/COM_Socket.h
branches/tile/source/blender/compositor/intern/COM_SocketConnection.cpp
branches/tile/source/blender/compositor/intern/COM_SocketConnection.h
branches/tile/source/blender/compositor/intern/COM_SocketReader.cpp
branches/tile/source/blender/compositor/intern/COM_SocketReader.h
branches/tile/source/blender/compositor/intern/COM_WorkPackage.cpp
branches/tile/source/blender/compositor/intern/COM_WorkPackage.h
branches/tile/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/tile/source/blender/compositor/intern/COM_WorkScheduler.h
branches/tile/source/blender/compositor/intern/COM_compositor.cpp
branches/tile/source/blender/compositor/nodes/
branches/tile/source/blender/compositor/nodes/COM_AlphaOverNode.cpp
branches/tile/source/blender/compositor/nodes/COM_AlphaOverNode.h
branches/tile/source/blender/compositor/nodes/COM_BlurNode.cpp
branches/tile/source/blender/compositor/nodes/COM_BlurNode.h
branches/tile/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
branches/tile/source/blender/compositor/nodes/COM_BokehBlurNode.h
branches/tile/source/blender/compositor/nodes/COM_BokehImageNode.cpp
branches/tile/source/blender/compositor/nodes/COM_BokehImageNode.h
branches/tile/source/blender/compositor/nodes/COM_BoxMaskNode.cpp
branches/tile/source/blender/compositor/nodes/COM_BoxMaskNode.h
branches/tile/source/blender/compositor/nodes/COM_BrightnessNode.cpp
branches/tile/source/blender/compositor/nodes/COM_BrightnessNode.h
branches/tile/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp
branches/tile/source/blender/compositor/nodes/COM_ColorBalanceNode.h
branches/tile/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp
branches/tile/source/blender/compositor/nodes/COM_ColorCorrectionNode.h
branches/tile/source/blender/compositor/nodes/COM_ColorCurveNode.cpp
branches/tile/source/blender/compositor/nodes/COM_ColorCurveNode.h
branches/tile/source/blender/compositor/nodes/COM_ColorNode.cpp
branches/tile/source/blender/compositor/nodes/COM_ColorNode.h
branches/tile/source/blender/compositor/nodes/COM_ColorRampNode.cpp
branches/tile/source/blender/compositor/nodes/COM_ColorRampNode.h
branches/tile/source/blender/compositor/nodes/COM_ColorSpaceNode.cpp.orig
branches/tile/source/blender/compositor/nodes/COM_ColorSpaceNode.h.orig
branches/tile/source/blender/compositor/nodes/COM_ColorToBWNode.cpp
branches/tile/source/blender/compositor/nodes/COM_ColorToBWNode.h
branches/tile/source/blender/compositor/nodes/COM_CombineHSVANode.cpp
branches/tile/source/blender/compositor/nodes/COM_CombineHSVANode.h
branches/tile/source/blender/compositor/nodes/COM_CombineRGBANode.cpp
branches/tile/source/blender/compositor/nodes/COM_CombineRGBANode.h
branches/tile/source/blender/compositor/nodes/COM_CompositorNode.cpp
branches/tile/source/blender/compositor/nodes/COM_CompositorNode.h
branches/tile/source/blender/compositor/nodes/COM_ConvertDataTypeNode.cpp
branches/tile/source/blender/compositor/nodes/COM_ConvertDataTypeNode.h
branches/tile/source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp
branches/tile/source/blender/compositor/nodes/COM_DifferenceMatteNode.h
branches/tile/source/blender/compositor/nodes/COM_DilateErode2Node.cpp
branches/tile/source/blender/compositor/nodes/COM_DilateErode2Node.h
branches/tile/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
branches/tile/source/blender/compositor/nodes/COM_DilateErodeNode.h
branches/tile/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp
branches/tile/source/blender/compositor/nodes/COM_DirectionalBlurNode.h
branches/tile/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp
branches/tile/source/blender/compositor/nodes/COM_EllipseMaskNode.h
branches/tile/source/blender/compositor/nodes/COM_FilterNode.cpp
branches/tile/source/blender/compositor/nodes/COM_FilterNode.h
branches/tile/source/blender/compositor/nodes/COM_FlipNode.cpp
branches/tile/source/blender/compositor/nodes/COM_FlipNode.h
branches/tile/source/blender/compositor/nodes/COM_GammaNode.cpp
branches/tile/source/blender/compositor/nodes/COM_GammaNode.h
branches/tile/source/blender/compositor/nodes/COM_GroupNode.cpp
branches/tile/source/blender/compositor/nodes/COM_GroupNode.h
branches/tile/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
branches/tile/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.h
branches/tile/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
branches/tile/source/blender/compositor/nodes/COM_HueSaturationValueNode.h
branches/tile/source/blender/compositor/nodes/COM_IDMaskNode.cpp
branches/tile/source/blender/compositor/nodes/COM_IDMaskNode.h
branches/tile/source/blender/compositor/nodes/COM_ImageNode.cpp
branches/tile/source/blender/compositor/nodes/COM_ImageNode.h
branches/tile/source/blender/compositor/nodes/COM_InvertNode.cpp
branches/tile/source/blender/compositor/nodes/COM_InvertNode.h
branches/tile/source/blender/compositor/nodes/COM_LensDistortionNode.cpp
branches/tile/source/blender/compositor/nodes/COM_LensDistortionNode.h
branches/tile/source/blender/compositor/nodes/COM_LensFlareNode.cpp
branches/tile/source/blender/compositor/nodes/COM_LensFlareNode.h
branches/tile/source/blender/compositor/nodes/COM_MathNode.cpp
branches/tile/source/blender/compositor/nodes/COM_MathNode.h
branches/tile/source/blender/compositor/nodes/COM_MixNode.cpp
branches/tile/source/blender/compositor/nodes/COM_MixNode.h
branches/tile/source/blender/compositor/nodes/COM_MuteNode.cpp
branches/tile/source/blender/compositor/nodes/COM_MuteNode.h
branches/tile/source/blender/compositor/nodes/COM_NormalNode.cpp
branches/tile/source/blender/compositor/nodes/COM_NormalNode.h
branches/tile/source/blender/compositor/nodes/COM_OpenCLTestNode.cpp
branches/tile/source/blender/compositor/nodes/COM_OpenCLTestNode.h
branches/tile/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
branches/tile/source/blender/compositor/nodes/COM_RenderLayersNode.h
branches/tile/source/blender/compositor/nodes/COM_RotateNode.cpp
branches/tile/source/blender/compositor/nodes/COM_RotateNode.h
branches/tile/source/blender/compositor/nodes/COM_ScaleNode.cpp
branches/tile/source/blender/compositor/nodes/COM_ScaleNode.h
branches/tile/source/blender/compositor/nodes/COM_SeparateHSVANode.cpp
branches/tile/source/blender/compositor/nodes/COM_SeparateHSVANode.h
branches/tile/source/blender/compositor/nodes/COM_SeparateRGBANode.cpp
branches/tile/source/blender/compositor/nodes/COM_SeparateRGBANode.h
branches/tile/source/blender/compositor/nodes/COM_SetAlphaNode.cpp
branches/tile/source/blender/compositor/nodes/COM_SetAlphaNode.h
branches/tile/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
branches/tile/source/blender/compositor/nodes/COM_SocketProxyNode.h
branches/tile/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
branches/tile/source/blender/compositor/nodes/COM_SplitViewerNode.h
branches/tile/source/blender/compositor/nodes/COM_SwitchNode.cpp
branches/tile/source/blender/compositor/nodes/COM_SwitchNode.h
branches/tile/source/blender/compositor/nodes/COM_TextureNode.cpp
branches/tile/source/blender/compositor/nodes/COM_TextureNode.h
branches/tile/source/blender/compositor/nodes/COM_TimeNode.cpp
branches/tile/source/blender/compositor/nodes/COM_TimeNode.h
branches/tile/source/blender/compositor/nodes/COM_TonemapNode.cpp
branches/tile/source/blender/compositor/nodes/COM_TonemapNode.h
branches/tile/source/blender/compositor/nodes/COM_TranslateNode.cpp
branches/tile/source/blender/compositor/nodes/COM_TranslateNode.h
branches/tile/source/blender/compositor/nodes/COM_ValueNode.cpp
branches/tile/source/blender/compositor/nodes/COM_ValueNode.h
branches/tile/source/blender/compositor/nodes/COM_VectorCurveNode.cpp
branches/tile/source/blender/compositor/nodes/COM_VectorCurveNode.h
branches/tile/source/blender/compositor/nodes/COM_ViewerNode.cpp
branches/tile/source/blender/compositor/nodes/COM_ViewerNode.h
branches/tile/source/blender/compositor/nodes/COM_ZCombineNode.cpp
branches/tile/source/blender/compositor/nodes/COM_ZCombineNode.h
branches/tile/source/blender/compositor/operations/
branches/tile/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp
branches/tile/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h
branches/tile/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp
branches/tile/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h
branches/tile/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp
branches/tile/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h
branches/tile/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
branches/tile/source/blender/compositor/operations/COM_BlurBaseOperation.h
branches/tile/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
branches/tile/source/blender/compositor/operations/COM_BokehBlurOperation.h
branches/tile/source/blender/compositor/operations/COM_BokehImageOperation.cpp
branches/tile/source/blender/compositor/operations/COM_BokehImageOperation.h
branches/tile/source/blender/compositor/operations/COM_BoxMaskOperation.cpp
branches/tile/source/blender/compositor/operations/COM_BoxMaskOperation.h
branches/tile/source/blender/compositor/operations/COM_BrightnessOperation.cpp
branches/tile/source/blender/compositor/operations/COM_BrightnessOperation.h
branches/tile/source/blender/compositor/operations/COM_ChangeHSVOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ChangeHSVOperation.h
branches/tile/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h
branches/tile/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h
branches/tile/source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ColorCorrectionOperation.h
branches/tile/source/blender/compositor/operations/COM_ColorCurveOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ColorCurveOperation.h
branches/tile/source/blender/compositor/operations/COM_ColorRampOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ColorRampOperation.h
branches/tile/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
branches/tile/source/blender/compositor/operations/COM_CombineChannelsOperation.h
branches/tile/source/blender/compositor/operations/COM_CompositorOperation.cpp
branches/tile/source/blender/compositor/operations/COM_CompositorOperation.h
branches/tile/source/blender/compositor/operations/COM_ConvertColorSpaceOperation.cpp.orig
branches/tile/source/blender/compositor/operations/COM_ConvertColorSpaceOperation.h.orig
branches/tile/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h
branches/tile/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h
branches/tile/source/blender/compositor/operations/COM_ConvertColourToValueProg.cpp
branches/tile/source/blender/compositor/operations/COM_ConvertColourToValueProg.h
branches/tile/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
branches/tile/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h
branches/tile/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h
branches/tile/source/blender/compositor/operations/COM_ConvertValueToColourProg.cpp
branches/tile/source/blender/compositor/operations/COM_ConvertValueToColourProg.h
branches/tile/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h
branches/tile/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h
branches/tile/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h
branches/tile/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h
branches/tile/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h
branches/tile/source/blender/compositor/operations/COM_CurveBaseOperation.cpp
branches/tile/source/blender/compositor/operations/COM_CurveBaseOperation.h
branches/tile/source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp
branches/tile/source/blender/compositor/operations/COM_DifferenceMatteOperation.h
branches/tile/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
branches/tile/source/blender/compositor/operations/COM_DilateErodeOperation.h
branches/tile/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
branches/tile/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
branches/tile/source/blender/compositor/operations/COM_DotproductOperation.cpp
branches/tile/source/blender/compositor/operations/COM_DotproductOperation.h
branches/tile/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp
branches/tile/source/blender/compositor/operations/COM_EllipseMaskOperation.h
branches/tile/source/blender/compositor/operations/COM_FlipOperation.cpp
branches/tile/source/blender/compositor/operations/COM_FlipOperation.h
branches/tile/source/blender/compositor/operations/COM_GammaOperation.cpp
branches/tile/source/blender/compositor/operations/COM_GammaOperation.h
branches/tile/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
branches/tile/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
branches/tile/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
branches/tile/source/blender/compositor/operations/COM_GaussianXBlurOperation.h
branches/tile/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
branches/tile/source/blender/compositor/operations/COM_GaussianYBlurOperation.h
branches/tile/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp
branches/tile/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h
branches/tile/source/blender/compositor/operations/COM_IDMaskOperation.cpp
branches/tile/source/blender/compositor/operations/COM_IDMaskOperation.h
branches/tile/source/blender/compositor/operations/COM_ImageOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ImageOperation.h
branches/tile/source/blender/compositor/operations/COM_InvertOperation.cpp
branches/tile/source/blender/compositor/operations/COM_InvertOperation.h
branches/tile/source/blender/compositor/operations/COM_LensGhostOperation.cpp
branches/tile/source/blender/compositor/operations/COM_LensGhostOperation.h
branches/tile/source/blender/compositor/operations/COM_LensGlowImageOperation.cpp
branches/tile/source/blender/compositor/operations/COM_LensGlowImageOperation.h
branches/tile/source/blender/compositor/operations/COM_LensGlowOperation.cpp
branches/tile/source/blender/compositor/operations/COM_LensGlowOperation.h
branches/tile/source/blender/compositor/operations/COM_MathBaseOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MathBaseOperation.h
branches/tile/source/blender/compositor/operations/COM_MixAddOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MixAddOperation.h
branches/tile/source/blender/compositor/operations/COM_MixBaseOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MixBaseOperation.h
branches/tile/source/blender/compositor/operations/COM_MixBlendOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MixBlendOperation.h
branches/tile/source/blender/compositor/operations/COM_MixBurnOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MixBurnOperation.h
branches/tile/source/blender/compositor/operations/COM_MixColorOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MixColorOperation.h
branches/tile/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MixDarkenOperation.h
branches/tile/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MixDifferenceOperation.h
branches/tile/source/blender/compositor/operations/COM_MixDivideOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MixDivideOperation.h
branches/tile/source/blender/compositor/operations/COM_MixDodgeOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MixDodgeOperation.h
branches/tile/source/blender/compositor/operations/COM_MixHueOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MixHueOperation.h
branches/tile/source/blender/compositor/operations/COM_MixLightenOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MixLightenOperation.h
branches/tile/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MixLinearLightOperation.h
branches/tile/source/blender/compositor/operations/COM_MixMultiplyOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MixMultiplyOperation.h
branches/tile/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MixOverlayOperation.h
branches/tile/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MixSaturationOperation.h
branches/tile/source/blender/compositor/operations/COM_MixScreenOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MixScreenOperation.h
branches/tile/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MixSoftLightOperation.h
branches/tile/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MixSubtractOperation.h
branches/tile/source/blender/compositor/operations/COM_MixValueOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MixValueOperation.h
branches/tile/source/blender/compositor/operations/COM_OpenCLKernels.cl
branches/tile/source/blender/compositor/operations/COM_OpenCLKernels.cl.cpp
branches/tile/source/blender/compositor/operations/COM_OpenCLTestOperation.cpp
branches/tile/source/blender/compositor/operations/COM_OpenCLTestOperation.h
branches/tile/source/blender/compositor/operations/COM_PreviewOperation.cpp
branches/tile/source/blender/compositor/operations/COM_PreviewOperation.h
branches/tile/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h
branches/tile/source/blender/compositor/operations/COM_QualityStepHelper.cpp
branches/tile/source/blender/compositor/operations/COM_QualityStepHelper.h
branches/tile/source/blender/compositor/operations/COM_ReadBufferOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ReadBufferOperation.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersAOOperation.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersAOOperation.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersAlphaProg.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersAlphaProg.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersBaseProg.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersColorOperation.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersColorOperation.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersDepthProg.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersDepthProg.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersDiffuseOperation.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersDiffuseOperation.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersEmitOperation.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersEmitOperation.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersEnvironmentOperation.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersEnvironmentOperation.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersImageProg.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersImageProg.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersIndirectOperation.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersIndirectOperation.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersMaterialIndexOperation.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersMaterialIndexOperation.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersMistOperation.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersMistOperation.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersNormalOperation.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersNormalOperation.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersObjectIndexOperation.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersObjectIndexOperation.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersReflectionOperation.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersReflectionOperation.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersRefractionOperation.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersRefractionOperation.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersShadowOperation.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersShadowOperation.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersSpecularOperation.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersSpecularOperation.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersSpeedOperation.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersSpeedOperation.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersUVOperation.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersUVOperation.h
branches/tile/source/blender/compositor/operations/COM_RotateOperation.cpp
branches/tile/source/blender/compositor/operations/COM_RotateOperation.h
branches/tile/source/blender/compositor/operations/COM_ScaleOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ScaleOperation.h
branches/tile/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h
branches/tile/source/blender/compositor/operations/COM_SeparateChannelOperation.cpp
branches/tile/source/blender/compositor/operations/COM_SeparateChannelOperation.h
branches/tile/source/blender/compositor/operations/COM_SetAlphaOperation.cpp
branches/tile/source/blender/compositor/operations/COM_SetAlphaOperation.h
branches/tile/source/blender/compositor/operations/COM_SetColorOperation.cpp
branches/tile/source/blender/compositor/operations/COM_SetColorOperation.h
branches/tile/source/blender/compositor/operations/COM_SetValueOperation.cpp
branches/tile/source/blender/compositor/operations/COM_SetValueOperation.h
branches/tile/source/blender/compositor/operations/COM_SetVectorOperation.cpp
branches/tile/source/blender/compositor/operations/COM_SetVectorOperation.h
branches/tile/source/blender/compositor/operations/COM_SocketProxyOperation.cpp
branches/tile/source/blender/compositor/operations/COM_SocketProxyOperation.h
branches/tile/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
branches/tile/source/blender/compositor/operations/COM_SplitViewerOperation.h
branches/tile/source/blender/compositor/operations/COM_TextureOperation.cpp
branches/tile/source/blender/compositor/operations/COM_TextureOperation.h
branches/tile/source/blender/compositor/operations/COM_TonemapOperation.cpp
branches/tile/source/blender/compositor/operations/COM_TonemapOperation.h
branches/tile/source/blender/compositor/operations/COM_TranslateOperation.cpp
branches/tile/source/blender/compositor/operations/COM_TranslateOperation.h
branches/tile/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
branches/tile/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
branches/tile/source/blender/compositor/operations/COM_VectorCurveOperation.cpp
branches/tile/source/blender/compositor/operations/COM_VectorCurveOperation.h
branches/tile/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ViewerBaseOperation.h
branches/tile/source/blender/compositor/operations/COM_ViewerOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ViewerOperation.h
branches/tile/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
branches/tile/source/blender/compositor/operations/COM_WriteBufferOperation.h
branches/tile/source/blender/compositor/operations/COM_ZCombineOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ZCombineOperation.h
branches/tile/source/blender/nodes/composite/nodes/node_composite_bokehblur.c
branches/tile/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
branches/tile/source/blender/nodes/composite/nodes/node_composite_boxmask.c
branches/tile/source/blender/nodes/composite/nodes/node_composite_dilate2.c
branches/tile/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
branches/tile/source/blender/nodes/composite/nodes/node_composite_opencltest.c
branches/tile/source/blender/nodes/composite/nodes/node_composite_switch.c
branches/tile/source/blender/opencl/
branches/tile/source/blender/opencl/CMakeLists.txt
branches/tile/source/blender/opencl/OCL_opencl.h
branches/tile/source/blender/opencl/SConscript
branches/tile/source/blender/opencl/intern/
branches/tile/source/blender/opencl/intern/clew.c
branches/tile/source/blender/opencl/intern/clew.h
Modified: branches/tile/release/scripts/startup/bl_ui/space_node.py
===================================================================
--- branches/tile/release/scripts/startup/bl_ui/space_node.py 2011-11-30 21:20:16 UTC (rev 42302)
+++ branches/tile/release/scripts/startup/bl_ui/space_node.py 2011-11-30 22:23:40 UTC (rev 42303)
@@ -193,5 +193,25 @@
col.prop(snode, "backdrop_y", text="Y")
col.operator("node.backimage_move", text="Move")
+class NODE_PT_quality(bpy.types.Panel):
+ bl_space_type = 'NODE_EDITOR'
+ bl_region_type = 'UI'
+ bl_label = "Quality"
+
+ @classmethod
+ def poll(cls, context):
+ snode = context.space_data
+ return snode.tree_type == 'COMPOSITING'
+
+ def draw(self, context):
+ layout = self.layout
+ snode = context.space_data
+ tree = snode.node_tree
+
+ layout.prop(tree, "render_quality")
+ layout.prop(tree, "edit_quality")
+ layout.prop(tree, "chunksize")
+ layout.prop(tree, "opencl")
+
if __name__ == "__main__": # only for live edit.
bpy.utils.register_module(__name__)
Modified: branches/tile/source/blender/CMakeLists.txt
===================================================================
--- branches/tile/source/blender/CMakeLists.txt 2011-11-30 21:20:16 UTC (rev 42302)
+++ branches/tile/source/blender/CMakeLists.txt 2011-11-30 22:23:40 UTC (rev 42303)
@@ -92,11 +92,13 @@
add_subdirectory(blenkernel)
add_subdirectory(blenlib)
add_subdirectory(render)
+add_subdirectory(compositor)
add_subdirectory(blenfont)
add_subdirectory(blenloader)
add_subdirectory(blenpluginapi)
add_subdirectory(ikplugin)
add_subdirectory(gpu)
+add_subdirectory(opencl)
add_subdirectory(imbuf)
add_subdirectory(avi)
add_subdirectory(nodes)
Modified: branches/tile/source/blender/SConscript
===================================================================
--- branches/tile/source/blender/SConscript 2011-11-30 21:20:16 UTC (rev 42302)
+++ branches/tile/source/blender/SConscript 2011-11-30 22:23:40 UTC (rev 42303)
@@ -8,10 +8,12 @@
'blenloader/SConscript',
'blenpluginapi/SConscript',
'gpu/SConscript',
+ 'opencl/SConscript',
'editors/SConscript',
'imbuf/SConscript',
'makesdna/SConscript',
'render/SConscript',
+ 'compositor/SConscript',
'nodes/SConscript',
'modifiers/SConscript',
'ikplugin/SConscript',
Modified: branches/tile/source/blender/blenkernel/BKE_node.h
===================================================================
--- branches/tile/source/blender/blenkernel/BKE_node.h 2011-11-30 21:20:16 UTC (rev 42302)
+++ branches/tile/source/blender/blenkernel/BKE_node.h 2011-11-30 22:23:40 UTC (rev 42303)
@@ -143,6 +143,8 @@
void (*uifunc)(struct uiLayout *, struct bContext *C, struct PointerRNA *ptr);
/// Additional parameters in the side panel.
void (*uifuncbut)(struct uiLayout *, struct bContext *C, struct PointerRNA *ptr);
+ /// Additional drawing on backdrop.
+ void (*uibackdropfunc)(struct SpaceNode* snode, struct ImBuf* backdrop, struct bNode* node, int x, int y);
/// Optional custom label function for the node header.
const char *(*labelfunc)(struct bNode *);
/// Optional custom resize handle polling.
@@ -645,6 +647,17 @@
#define CMP_NODE_TONEMAP 302
#define CMP_NODE_LENSDIST 303
+#define CMP_NODE_DILATEERODE2 311
+#define CMP_NODE_COLORCORRECTION 312
+#define CMP_NODE_MASK_BOX 313
+#define CMP_NODE_MASK_ELLIPSE 314
+#define CMP_NODE_BOKEHIMAGE 315
+#define CMP_NODE_BOKEHBLUR 316
+#define CMP_NODE_LENSFLARE 317
+#define CMP_NODE_SWITCH 318
+
+#define CMP_NODE_OPENCLTEST 319
+
/* channel toggles */
#define CMP_CHAN_RGB 1
#define CMP_CHAN_A 2
Modified: branches/tile/source/blender/blenkernel/intern/node.c
===================================================================
--- branches/tile/source/blender/blenkernel/intern/node.c 2011-11-30 21:20:16 UTC (rev 42302)
+++ branches/tile/source/blender/blenkernel/intern/node.c 2011-11-30 22:23:40 UTC (rev 42303)
@@ -1886,6 +1886,14 @@
register_node_type_cmp_transform(ttype);
register_node_type_cmp_stabilize2d(ttype);
register_node_type_cmp_moviedistortion(ttype);
+
+ register_node_type_cmp_dilateerode2(ttype);
+ register_node_type_cmp_boxmask(ttype);
+ register_node_type_cmp_ellipsemask(ttype);
+ register_node_type_cmp_bokehimage(ttype);
+ register_node_type_cmp_bokehblur(ttype);
+ register_node_type_cmp_switch(ttype);
+ register_node_type_cmp_opencltest(ttype);
}
static void registerShaderNodes(bNodeTreeType *ttype)
Modified: branches/tile/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/tile/source/blender/blenloader/intern/readfile.c 2011-11-30 21:20:16 UTC (rev 42302)
+++ branches/tile/source/blender/blenloader/intern/readfile.c 2011-11-30 22:23:40 UTC (rev 42303)
@@ -12629,7 +12629,29 @@
/* put compatibility code here until next subversion bump */
{
- /* nothing! */
+ // composite redesign
+ Scene *scene;
+ bNode *node;
+ for (scene=main->scene.first; scene; scene=scene->id.next)
+ if (scene->nodetree)
+ for (node=scene->nodetree->nodes.first; node; node=node->next)
+ if (node->type==CMP_NODE_R_LAYERS) {
+ NodeRenderlayerData *data= node->storage;
+ if (!data) {
+ data = MEM_callocN(sizeof(NodeRenderlayerData), "NodeRenderLayerData");
+ data->angle = 0.0f;
+ data->offsetx = 0.0f;
+ data->offsety = 0.0f;
+ data->scalex = 1.0f;
+ data->scaley = 1.0f;
+ node->storage = data;
+ }
+ }
+ for (scene=main->scene.first; scene; scene=scene->id.next)
+ if (scene->nodetree)
+ if ( scene->nodetree->chunksize == 0) {
+ scene->nodetree->chunksize = 128;
+ }
}
/* WATCH IT!!!: pointers from libdata have not been converted yet here! */
Added: branches/tile/source/blender/compositor/CMakeLists.txt
===================================================================
--- branches/tile/source/blender/compositor/CMakeLists.txt (rev 0)
+++ branches/tile/source/blender/compositor/CMakeLists.txt 2011-11-30 22:23:40 UTC (rev 42303)
@@ -0,0 +1,485 @@
+# $Id: CMakeLists.txt 14444 2008-04-16 22:40:48Z hos $
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# The Original Code is Copyright (C) 2011, Blender Foundation
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): Jeroen Bakker, Monique Dewanchand, Blender Developers Fund.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+set(INC
+ .
+ ../blenkernel
+ ../blenlib
+ ../makesdna
+ ../render/extern/include
+ ../render/intern/include
+ ../makesrna
+ ../blenloader
+ ../blenlib
+ ../windowmanager
+ ../imbuf
+ ../../../intern/guardedalloc
+ nodes
+ ../nodes/
+ ../nodes/composite
+ ../nodes/intern
+ intern
+ operations
+ ../opencl
+)
+
+set(SRC
+ COM_compositor.h
+ COM_defines.h
+
+ intern/COM_compositor.cpp
+ intern/COM_ExecutionSystem.cpp
+ intern/COM_ExecutionSystem.h
+ intern/COM_ExecutionSystemHelper.cpp
+ intern/COM_ExecutionSystemHelper.h
+ intern/COM_Converter.cpp
+ intern/COM_Converter.h
+ intern/COM_ExecutionGroup.cpp
+ intern/COM_ExecutionGroup.h
+ intern/COM_Node.cpp
+ intern/COM_Node.h
+ intern/COM_NodeBase.cpp
+ intern/COM_NodeBase.h
+ intern/COM_NodeOperation.cpp
+ intern/COM_NodeOperation.h
+ intern/COM_Socket.cpp
+ intern/COM_Socket.h
+ intern/COM_SocketReader.cpp
+ intern/COM_SocketReader.h
+ intern/COM_InputSocket.cpp
+ intern/COM_InputSocket.h
+ intern/COM_OutputSocket.cpp
+ intern/COM_OutputSocket.h
+ intern/COM_SocketConnection.cpp
+ intern/COM_SocketConnection.h
+ intern/COM_MemoryProxy.cpp
+ intern/COM_MemoryProxy.h
+ intern/COM_MemoryBuffer.cpp
+ intern/COM_MemoryBuffer.h
+ intern/COM_MemoryManager.cpp
+ intern/COM_MemoryManager.h
+ intern/COM_MemoryManagerState.cpp
+ intern/COM_MemoryManagerState.h
+ intern/COM_WorkScheduler.cpp
+ intern/COM_WorkScheduler.h
+ intern/COM_WorkPackage.cpp
+ intern/COM_WorkPackage.h
+ intern/COM_ChunkOrder.cpp
+ intern/COM_ChunkOrder.h
+ intern/COM_ChunkOrderHotspot.cpp
+ intern/COM_ChunkOrderHotspot.h
+ intern/COM_Device.cpp
+ intern/COM_Device.h
+ intern/COM_CPUDevice.cpp
+ intern/COM_CPUDevice.h
+ intern/COM_OpenCLDevice.cpp
+ intern/COM_OpenCLDevice.h
+ intern/COM_CompositorContext.cpp
+ intern/COM_CompositorContext.h
+ intern/COM_ChannelInfo.cpp
+ intern/COM_ChannelInfo.h
+ operations/COM_QualityStepHelper.h
+ operations/COM_QualityStepHelper.cpp
+
+# Internal nodes
+ nodes/COM_ConvertDataTypeNode.cpp
+ nodes/COM_ConvertDataTypeNode.h
+ nodes/COM_MuteNode.cpp
+ nodes/COM_MuteNode.h
+ nodes/COM_GroupNode.cpp
+ nodes/COM_GroupNode.h
+ nodes/COM_SocketProxyNode.cpp
+ nodes/COM_SocketProxyNode.h
+
+# input nodes
+ nodes/COM_RenderLayersNode.cpp
+ nodes/COM_RenderLayersNode.h
+ nodes/COM_ImageNode.cpp
+ nodes/COM_ImageNode.h
+ nodes/COM_TextureNode.cpp
+ nodes/COM_TextureNode.h
+ nodes/COM_BokehImageNode.cpp
+ nodes/COM_BokehImageNode.h
+ nodes/COM_ColorNode.cpp
+ nodes/COM_ColorNode.h
+ nodes/COM_ValueNode.cpp
+ nodes/COM_ValueNode.h
+ nodes/COM_TimeNode.cpp
+ nodes/COM_TimeNode.h
+ nodes/COM_SwitchNode.cpp
+ nodes/COM_SwitchNode.h
+
+# output nodes
+ nodes/COM_CompositorNode.cpp
+ nodes/COM_CompositorNode.h
+ nodes/COM_ViewerNode.cpp
+ nodes/COM_ViewerNode.h
+ nodes/COM_SplitViewerNode.cpp
+ nodes/COM_SplitViewerNode.h
+
+# distort nodes
+ nodes/COM_TranslateNode.cpp
+ nodes/COM_TranslateNode.h
+ nodes/COM_ScaleNode.cpp
+ nodes/COM_ScaleNode.h
+ nodes/COM_RotateNode.cpp
+ nodes/COM_RotateNode.h
+ nodes/COM_FlipNode.cpp
+ nodes/COM_FlipNode.h
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list