[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48303] branches/soc-2011-tomato: svn merge ^/trunk/blender -r48288:48302
Campbell Barton
ideasman42 at gmail.com
Tue Jun 26 09:45:17 CEST 2012
Revision: 48303
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48303
Author: campbellbarton
Date: 2012-06-26 07:44:59 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r48288:48302
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48288
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ChannelInfo.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ChannelInfo.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ChunkOrder.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ChunkOrder.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ChunkOrderHotspot.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ChunkOrderHotspot.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_CompositorContext.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_CompositorContext.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_Converter.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_Converter.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionGroup.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystem.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystem.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystemHelper.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_InputSocket.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_InputSocket.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryBuffer.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryBuffer.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryProxy.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryProxy.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_Node.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_Node.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_NodeBase.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_NodeBase.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_NodeOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_NodeOperation.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_OpenCLDevice.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_OpenCLDevice.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_OutputSocket.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_OutputSocket.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_Socket.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_Socket.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_SocketConnection.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_SocketConnection.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_SocketReader.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkPackage.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkPackage.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_AlphaOverNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BlurNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BokehBlurNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ChannelMatteNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ChromaMatteNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorBalanceNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorMatteNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorRampNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorSpillNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorToBWNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_CombineHSVANode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_CombineRGBANode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_CombineYCCANode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_CombineYUVANode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_CompositorNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ConvertAlphaNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_CropNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DefocusNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DifferenceMatteNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DilateErodeNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DisplaceNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DistanceMatteNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_FilterNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_HueSaturationValueNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ImageNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_KeyingNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_KeyingNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_KeyingScreenNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_LuminanceMatteNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MapUVNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MapValueNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MaskNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MathNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MixNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MovieClipNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_NormalNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_OutputFileNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SeparateHSVANode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SeparateRGBANode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SeparateYCCANode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SeparateYUVANode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SetAlphaNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SplitViewerNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_Stabilize2dNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SwitchNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_TrackPositionNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_TransformNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ViewerNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ZCombineNode.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_AntiAliasOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_AntiAliasOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_BilateralBlurOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_BlurBaseOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_BokehBlurOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_BokehImageOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_BokehImageOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_BoxMaskOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_BoxMaskOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_BrightnessOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_BrightnessOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CalculateMeanOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CalculateMeanOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ChangeHSVOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ChangeHSVOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ChannelMatteOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ChannelMatteOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ChromaMatteOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ChromaMatteOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorCorrectionOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorCurveOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorCurveOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorMatteOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorMatteOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorRampOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorRampOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorSpillOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorSpillOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CombineChannelsOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CompositorOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CompositorOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertColorProfileOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertColourToValueProg.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertColourToValueProg.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertValueToColourProg.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertValueToColourProg.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CropOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CropOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CurveBaseOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CurveBaseOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DifferenceMatteOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DilateErodeOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DisplaceOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DisplaceOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DisplaceSimpleOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DistanceMatteOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DistanceMatteOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DotproductOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DotproductOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_EllipseMaskOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_FlipOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_FlipOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GammaCorrectOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GammaCorrectOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GammaOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GammaOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianXBlurOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianYBlurOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GlareBaseOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GlareBaseOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GlareFogGlowOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GlareGhostOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GlareSimpleStarOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GlareStreaksOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GlareThresholdOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GlareThresholdOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_IDMaskOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_IDMaskOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ImageOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ImageOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_InvertOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_InvertOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingBlurOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingClipOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingClipOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingDespillOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingDespillOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingScreenOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_LuminanceMatteOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MapUVOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MapUVOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MapValueOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MapValueOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MaskOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MaskOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MathBaseOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MathBaseOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixAddOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixBaseOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixBaseOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixBlendOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixBurnOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixColorOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixDivideOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixDodgeOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixGlareOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixHueOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixLightenOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixMultiplyOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixScreenOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixValueOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MovieClipOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MovieClipOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MovieDistortionOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MultilayerImageOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_NormalizeOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_NormalizeOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_OutputFileOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_OutputFileOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_PreviewOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_PreviewOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_QualityStepHelper.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_QualityStepHelper.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ReadBufferOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ReadBufferOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_RenderLayersBaseProg.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_RenderLayersMistOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_RotateOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_RotateOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ScaleOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ScaleOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SeparateChannelOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SeparateChannelOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SetAlphaOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SetAlphaOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SetColorOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SetColorOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SetSamplerOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SetSamplerOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SetValueOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SetValueOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SetVectorOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SetVectorOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SocketProxyOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SocketProxyOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SplitViewerOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_TextureOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_TextureOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_TonemapOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_TonemapOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_TranslateOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_TranslateOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_VectorBlurOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_VectorCurveOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_VectorCurveOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerBaseOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_WriteBufferOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ZCombineOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ZCombineOperation.h
branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_buttons.c
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-48288
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-48302
Modified: branches/soc-2011-tomato/source/blender/compositor/intern/COM_ChannelInfo.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/intern/COM_ChannelInfo.cpp 2012-06-26 07:32:24 UTC (rev 48302)
+++ branches/soc-2011-tomato/source/blender/compositor/intern/COM_ChannelInfo.cpp 2012-06-26 07:44:59 UTC (rev 48303)
@@ -29,7 +29,7 @@
*/
ChannelInfo::ChannelInfo()
{
- this->number = 0;
- this->premultiplied = true;
- this->type = COM_CT_UNUSED;
+ this->m_number = 0;
+ this->m_premultiplied = true;
+ this->m_type = COM_CT_UNUSED;
}
Modified: branches/soc-2011-tomato/source/blender/compositor/intern/COM_ChannelInfo.h
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/intern/COM_ChannelInfo.h 2012-06-26 07:32:24 UTC (rev 48302)
+++ branches/soc-2011-tomato/source/blender/compositor/intern/COM_ChannelInfo.h 2012-06-26 07:44:59 UTC (rev 48303)
@@ -61,23 +61,23 @@
/**
* @brief the channel number, in the connection. [0-3]
*/
- int number;
+ int m_number;
/**
* @brief type of channel
*/
- ChannelType type;
+ ChannelType m_type;
/**
* @brieg Is this value in this channel premultiplied with its alpha
* @note only valid if type = ColorComponent;
*/
- bool premultiplied;
+ bool m_premultiplied;
// /**
-// * Color space of this value.
-// * only valid when type = ColorComponent;
-// */
+// * Color space of this value.
+// * only valid when type = ColorComponent;
+// */
// string colorspacename;
public:
@@ -89,32 +89,32 @@
/**
* @brief set the index of this channel in the SocketConnection
*/
- void setNumber(const int number) { this->number = number; }
+ void setNumber(const int number) { this->m_number = number; }
/**
* @brief get the index of this channel in the SocketConnection
*/
- const int getNumber() const { return this->number; }
+ const int getNumber() const { return this->m_number; }
/**
* @brief set the type of channel
*/
- void setType(const ChannelType type) { this->type = type; }
+ void setType(const ChannelType type) { this->m_type = type; }
/**
* @brief get the type of channel
*/
- const ChannelType getType() const { return this->type; }
+ const ChannelType getType() const { return this->m_type; }
/**
* @brief set the premultiplicatioin of this channel
*/
- void setPremultiplied(const bool premultiplied) { this->premultiplied = premultiplied; }
+ void setPremultiplied(const bool premultiplied) { this->m_premultiplied = premultiplied; }
/**
* @brief is this channel premultiplied
*/
- const bool isPremultiplied() const { return this->premultiplied; }
+ const bool isPremultiplied() const { return this->m_premultiplied; }
};
Modified: branches/soc-2011-tomato/source/blender/compositor/intern/COM_ChunkOrder.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/intern/COM_ChunkOrder.cpp 2012-06-26 07:32:24 UTC (rev 48302)
+++ branches/soc-2011-tomato/source/blender/compositor/intern/COM_ChunkOrder.cpp 2012-06-26 07:44:59 UTC (rev 48303)
@@ -25,10 +25,10 @@
ChunkOrder::ChunkOrder()
{
- this->distance = 0.0;
- this->number = 0;
- this->x = 0;
- this->y = 0;
+ this->m_distance = 0.0;
+ this->m_number = 0;
+ this->m_x = 0;
+ this->m_y = 0;
}
void ChunkOrder::determineDistance(ChunkOrderHotspot **hotspots, unsigned int numberOfHotspots)
@@ -37,15 +37,15 @@
double distance = MAXFLOAT;
for (index = 0; index < numberOfHotspots; index++) {
ChunkOrderHotspot *hotspot = hotspots[index];
- double ndistance = hotspot->determineDistance(this->x, this->y);
+ double ndistance = hotspot->determineDistance(this->m_x, this->m_y);
if (ndistance < distance) {
distance = ndistance;
}
}
- this->distance = distance;
+ this->m_distance = distance;
}
bool operator<(const ChunkOrder& a, const ChunkOrder& b)
{
- return a.distance < b.distance;
+ return a.m_distance < b.m_distance;
}
Modified: branches/soc-2011-tomato/source/blender/compositor/intern/COM_ChunkOrder.h
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/intern/COM_ChunkOrder.h 2012-06-26 07:32:24 UTC (rev 48302)
+++ branches/soc-2011-tomato/source/blender/compositor/intern/COM_ChunkOrder.h 2012-06-26 07:44:59 UTC (rev 48303)
@@ -26,20 +26,20 @@
#include "COM_ChunkOrderHotspot.h"
class ChunkOrder {
private:
- unsigned int number;
- int x;
- int y;
- double distance;
+ unsigned int m_number;
+ int m_x;
+ int m_y;
+ double m_distance;
public:
ChunkOrder();
void determineDistance(ChunkOrderHotspot **hotspots, unsigned int numberOfHotspots);
friend bool operator<(const ChunkOrder& a, const ChunkOrder& b);
- void setChunkNumber(unsigned int chunknumber) { this->number = chunknumber; }
- void setX(int x) { this->x = x; }
- void setY(int y) { this->y = y; }
- unsigned int getChunkNumber() { return this->number; }
- double getDistance() { return this->distance; }
+ void setChunkNumber(unsigned int chunknumber) { this->m_number = chunknumber; }
+ void setX(int x) { this->m_x = x; }
+ void setY(int y) { this->m_y = y; }
+ unsigned int getChunkNumber() { return this->m_number; }
+ double getDistance() { return this->m_distance; }
};
#endif
Modified: branches/soc-2011-tomato/source/blender/compositor/intern/COM_ChunkOrderHotspot.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/intern/COM_ChunkOrderHotspot.cpp 2012-06-26 07:32:24 UTC (rev 48302)
+++ branches/soc-2011-tomato/source/blender/compositor/intern/COM_ChunkOrderHotspot.cpp 2012-06-26 07:44:59 UTC (rev 48303)
@@ -25,16 +25,16 @@
ChunkOrderHotspot::ChunkOrderHotspot(int x, int y, float addition)
{
- this->x = x;
- this->y = y;
- this->addition = addition;
+ this->m_x = x;
+ this->m_y = y;
+ this->m_addition = addition;
}
double ChunkOrderHotspot::determineDistance(int x, int y)
{
- int dx = x - this->x;
- int dy = y - this->y;
+ int dx = x - this->m_x;
+ int dy = y - this->m_y;
double result = sqrt((double)(dx * dx + dy * dy));
- result += (double)this->addition;
+ result += (double)this->m_addition;
return result;
}
Modified: branches/soc-2011-tomato/source/blender/compositor/intern/COM_ChunkOrderHotspot.h
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/intern/COM_ChunkOrderHotspot.h 2012-06-26 07:32:24 UTC (rev 48302)
+++ branches/soc-2011-tomato/source/blender/compositor/intern/COM_ChunkOrderHotspot.h 2012-06-26 07:44:59 UTC (rev 48303)
@@ -29,9 +29,9 @@
class ChunkOrderHotspot {
private:
- int x;
- int y;
- float addition;
+ int m_x;
+ int m_y;
+ float m_addition;
public:
ChunkOrderHotspot(int x, int y, float addition);
Modified: branches/soc-2011-tomato/source/blender/compositor/intern/COM_CompositorContext.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/intern/COM_CompositorContext.cpp 2012-06-26 07:32:24 UTC (rev 48302)
+++ branches/soc-2011-tomato/source/blender/compositor/intern/COM_CompositorContext.cpp 2012-06-26 07:44:59 UTC (rev 48303)
@@ -26,16 +26,16 @@
CompositorContext::CompositorContext()
{
- this->rd = NULL;
- this->quality = COM_QUALITY_HIGH;
- this->hasActiveOpenCLDevices = false;
- this->activegNode = NULL;
+ this->m_rd = NULL;
+ this->m_quality = COM_QUALITY_HIGH;
+ this->m_hasActiveOpenCLDevices = false;
+ this->m_activegNode = NULL;
}
const int CompositorContext::getFramenumber() const
{
- if (this->rd) {
- return this->rd->cfra;
+ if (this->m_rd) {
+ return this->m_rd->cfra;
}
else {
return -1; /* this should never happen */
@@ -44,8 +44,8 @@
const int CompositorContext::isColorManaged() const
{
- if (this->rd) {
- return this->rd->color_mgt_flag & R_COLOR_MANAGEMENT;
+ if (this->m_rd) {
+ return this->m_rd->color_mgt_flag & R_COLOR_MANAGEMENT;
}
else {
return 0; /* this should never happen */
Modified: branches/soc-2011-tomato/source/blender/compositor/intern/COM_CompositorContext.h
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/intern/COM_CompositorContext.h 2012-06-26 07:32:24 UTC (rev 48302)
+++ branches/soc-2011-tomato/source/blender/compositor/intern/COM_CompositorContext.h 2012-06-26 07:44:59 UTC (rev 48303)
@@ -41,38 +41,38 @@
* This field is initialized in ExecutionSystem and must only be read from that point on.
* @see ExecutionSystem
*/
- bool rendering;
+ bool m_rendering;
/**
* @brief The quality of the composite.
* This field is initialized in ExecutionSystem and must only be read from that point on.
* @see ExecutionSystem
*/
- CompositorQuality quality;
+ CompositorQuality m_quality;
/**
* @brief Reference to the render data that is being composited.
* This field is initialized in ExecutionSystem and must only be read from that point on.
* @see ExecutionSystem
*/
- RenderData *rd;
+ RenderData *m_rd;
/**
* @brief reference to the bNodeTree
* This field is initialized in ExecutionSystem and must only be read from that point on.
* @see ExecutionSystem
*/
- bNodeTree *bnodetree;
+ bNodeTree *m_bnodetree;
/**
* @brief activegNode the group node that is currently being edited.
*/
- bNode *activegNode;
+ bNode *m_activegNode;
/**
* @brief does this system have active opencl devices?
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list