[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49775] branches/soc-2011-tomato: svn merge ^/trunk/blender -r49763:49774
Campbell Barton
ideasman42 at gmail.com
Fri Aug 10 17:45:09 CEST 2012
Revision: 49775
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49775
Author: campbellbarton
Date: 2012-08-10 15:45:09 +0000 (Fri, 10 Aug 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r49763:49774
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49763
Modified Paths:
--------------
branches/soc-2011-tomato/SConstruct
branches/soc-2011-tomato/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-tomato/source/blender/compositor/COM_defines.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_InputSocket.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_InputSocket.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryBuffer.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_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.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_SocketReader.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h
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_AlphaOverPremultiplyOperation.h
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_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_ConvertColorToValueProg.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertColorToValueProg.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_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_ConvertValueToColorProg.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertValueToColorProg.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_ConvolutionEdgeFilterOperation.h
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_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_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_InpaintOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_InpaintOperation.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_MixAddOperation.h
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_MixBlendOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixBurnOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixBurnOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixColorOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixColorOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixDarkenOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixDifferenceOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixDivideOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixDivideOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixDodgeOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixDodgeOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixGlareOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixGlareOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixHueOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixHueOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixLightenOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixLightenOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixLinearLightOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixMultiplyOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixMultiplyOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixOverlayOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixSaturationOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixScreenOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixScreenOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixSoftLightOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixSubtractOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixValueOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixValueOperation.h
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_OpenCLKernels.cl
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_ReadBufferOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ReadBufferOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_RenderLayersAlphaProg.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_RenderLayersAlphaProg.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_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_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_TrackPositionOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_TrackPositionOperation.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_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/mesh/editmesh_tools.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_edit.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-49763
+ /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-49774
Modified: branches/soc-2011-tomato/SConstruct
===================================================================
--- branches/soc-2011-tomato/SConstruct 2012-08-10 15:31:54 UTC (rev 49774)
+++ branches/soc-2011-tomato/SConstruct 2012-08-10 15:45:09 UTC (rev 49775)
@@ -451,7 +451,7 @@
if not os.path.isdir ( B.root_build_dir + 'data_headers'):
os.makedirs ( B.root_build_dir + 'data_headers' )
# use for includes
-env['DATA_HEADERS'] = "#" + env['BF_BUILDDIR'] + "/data_headers"
+env['DATA_HEADERS'] = os.path.join(os.path.abspath(env['BF_BUILDDIR']), "data_headers")
def ensure_data(FILE_FROM, FILE_TO, VAR_NAME):
if os.sep == "\\":
FILE_FROM = FILE_FROM.replace("/", "\\")
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/seqeffects.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/seqeffects.c 2012-08-10 15:31:54 UTC (rev 49774)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/seqeffects.c 2012-08-10 15:45:09 UTC (rev 49775)
@@ -2486,7 +2486,7 @@
seqbasep = BKE_sequence_seqbase(&ed->seqbase, seq);
- if (seq->machine > 0) {
+ if (seq->machine > 1) {
i = BKE_sequencer_give_ibuf_seqbase(context, cfra, seq->machine - 1, seqbasep);
}
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c 2012-08-10 15:31:54 UTC (rev 49774)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c 2012-08-10 15:45:09 UTC (rev 49775)
@@ -3774,7 +3774,7 @@
return seq;
}
#else // WITH_AUDASPACE
-Sequence *sequencer_add_sound_strip(bContext *C, ListBase *seqbasep, SeqLoadInfo *seq_load)
+Sequence *BKE_sequencer_add_sound_strip(bContext *C, ListBase *seqbasep, SeqLoadInfo *seq_load)
{
(void) C;
(void) seqbasep;
Modified: branches/soc-2011-tomato/source/blender/compositor/COM_defines.h
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/COM_defines.h 2012-08-10 15:31:54 UTC (rev 49774)
+++ branches/soc-2011-tomato/source/blender/compositor/COM_defines.h 2012-08-10 15:45:09 UTC (rev 49775)
@@ -107,4 +107,6 @@
#define COM_NUMBER_OF_CHANNELS 4
+#define COM_BLUR_BOKEH_PIXELS 512
+
#endif
Modified: branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionGroup.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionGroup.cpp 2012-08-10 15:31:54 UTC (rev 49774)
+++ branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionGroup.cpp 2012-08-10 15:45:09 UTC (rev 49775)
@@ -186,7 +186,7 @@
this->m_cachedReadOperations.clear();
this->m_bTree = NULL;
}
-void ExecutionGroup::determineResolution(unsigned int resolution[])
+void ExecutionGroup::determineResolution(unsigned int resolution[2])
{
NodeOperation *operation = this->getOutputNodeOperation();
resolution[0] = operation->getWidth();
Modified: branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionGroup.h
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionGroup.h 2012-08-10 15:31:54 UTC (rev 49774)
+++ branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionGroup.h 2012-08-10 15:45:09 UTC (rev 49775)
@@ -270,13 +270,13 @@
* @brief determine the resolution of this ExecutionGroup
* @param resolution
*/
- void determineResolution(unsigned int resolution[]);
+ void determineResolution(unsigned int resolution[2]);
/**
* @brief set the resolution of this executiongroup
* @param resolution
*/
- void setResolution(unsigned int resolution[]) { this->m_width = resolution[0]; this->m_height = resolution[1]; }
+ void setResolution(unsigned int resolution[2]) { this->m_width = resolution[0]; this->m_height = resolution[1]; }
/**
* @brief get the width of this execution group
Modified: branches/soc-2011-tomato/source/blender/compositor/intern/COM_InputSocket.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/intern/COM_InputSocket.cpp 2012-08-10 15:31:54 UTC (rev 49774)
+++ branches/soc-2011-tomato/source/blender/compositor/intern/COM_InputSocket.cpp 2012-08-10 15:45:09 UTC (rev 49775)
@@ -54,7 +54,7 @@
return this->m_connection;
}
-void InputSocket::determineResolution(unsigned int resolution[], unsigned int preferredResolution[])
+void InputSocket::determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2])
{
if (this->isConnected()) {
this->m_connection->getFromSocket()->determineResolution(resolution, preferredResolution);
Modified: branches/soc-2011-tomato/source/blender/compositor/intern/COM_InputSocket.h
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/intern/COM_InputSocket.h 2012-08-10 15:31:54 UTC (rev 49774)
+++ branches/soc-2011-tomato/source/blender/compositor/intern/COM_InputSocket.h 2012-08-10 15:45:09 UTC (rev 49775)
@@ -89,7 +89,7 @@
* @param resolution the result of this operation
* @param preferredResolution the preferrable resolution as no resolution could be determined
*/
- void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]);
+ void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
/**
* @brief Notifies the Input of the data type (via a SocketConnection)
Modified: branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryBuffer.h
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryBuffer.h 2012-08-10 15:31:54 UTC (rev 49774)
+++ branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryBuffer.h 2012-08-10 15:45:09 UTC (rev 49775)
@@ -26,14 +26,12 @@
#define _COM_MemoryBuffer_h_
#include "COM_ExecutionGroup.h"
-#include "BLI_rect.h"
#include "COM_MemoryProxy.h"
extern "C" {
- //#include "BLI_threads.h"
#include "BLI_math.h"
+ #include "BLI_rect.h"
}
-//#include <vector>
/**
* @brief state of a memory buffer
@@ -147,6 +145,18 @@
const int dx = x - this->m_rect.xmin;
const int dy = y - this->m_rect.ymin;
const int offset = (this->m_chunkWidth * dy + dx) * COM_NUMBER_OF_CHANNELS;
+
+ BLI_assert(offset >= 0);
+ BLI_assert(offset < this->determineBufferSize() * COM_NUMBER_OF_CHANNELS);
+ BLI_assert(x >= this->m_rect.xmin && x < this->m_rect.xmax &&
+ y >= this->m_rect.ymin && y < this->m_rect.ymax);
+
+#if 0
+ /* always true */
+ BLI_assert((int)(MEM_allocN_len(this->m_buffer) / sizeof(*this->m_buffer)) ==
+ (int)(this->determineBufferSize() * COM_NUMBER_OF_CHANNELS));
+#endif
+
copy_v4_v4(result, &this->m_buffer[offset]);
}
Modified: branches/soc-2011-tomato/source/blender/compositor/intern/COM_NodeOperation.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/intern/COM_NodeOperation.cpp 2012-08-10 15:31:54 UTC (rev 49774)
+++ branches/soc-2011-tomato/source/blender/compositor/intern/COM_NodeOperation.cpp 2012-08-10 15:45:09 UTC (rev 49775)
@@ -38,7 +38,7 @@
this->m_btree = NULL;
}
-void NodeOperation::determineResolution(unsigned int resolution[], unsigned int preferredResolution[])
+void NodeOperation::determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2])
{
unsigned int temp[2];
unsigned int temp2[2];
Modified: branches/soc-2011-tomato/source/blender/compositor/intern/COM_NodeOperation.h
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/intern/COM_NodeOperation.h 2012-08-10 15:31:54 UTC (rev 49774)
+++ branches/soc-2011-tomato/source/blender/compositor/intern/COM_NodeOperation.h 2012-08-10 15:45:09 UTC (rev 49775)
@@ -96,7 +96,7 @@
* @param resolution the result of this operation
* @param preferredResolution the preferrable resolution as no resolution could be determined
*/
- virtual void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]);
+ virtual void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
/**
* @brief isOutputOperation determines whether this operation is an output of the ExecutionSystem during rendering or editing.
@@ -174,7 +174,7 @@
* @brief set the resolution
* @param resolution the resolution to set
*/
- void setResolution(unsigned int resolution[]) {
+ void setResolution(unsigned int resolution[2]) {
if (!isResolutionSet()) {
this->m_width = resolution[0];
this->m_height = resolution[1];
Modified: branches/soc-2011-tomato/source/blender/compositor/intern/COM_OutputSocket.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/intern/COM_OutputSocket.cpp 2012-08-10 15:31:54 UTC (rev 49774)
+++ branches/soc-2011-tomato/source/blender/compositor/intern/COM_OutputSocket.cpp 2012-08-10 15:45:09 UTC (rev 49775)
@@ -33,7 +33,7 @@
int OutputSocket::isOutputSocket() const { return true; }
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list