[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48894] branches/soc-2011-tomato: Merging r48889 through r48893 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Fri Jul 13 16:21:17 CEST 2012
Revision: 48894
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48894
Author: nazgul
Date: 2012-07-13 14:21:17 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
Merging r48889 through r48893 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48889
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48893
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/blenlib/BLI_threads.h
branches/soc-2011-tomato/source/blender/blenlib/intern/threads.c
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_SocketReader.h
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_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_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_GlareBaseOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GlareBaseOperation.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_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_OutputFileOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_PreviewOperation.cpp
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_SplitViewerOperation.cpp
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_ViewerOperation.cpp
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/space_image/image_draw.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_draw.c
branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_util.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-48888
+ /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-48893
Modified: branches/soc-2011-tomato/source/blender/blenlib/BLI_threads.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenlib/BLI_threads.h 2012-07-13 13:47:13 UTC (rev 48893)
+++ branches/soc-2011-tomato/source/blender/blenlib/BLI_threads.h 2012-07-13 14:21:17 UTC (rev 48894)
@@ -70,7 +70,7 @@
* One custom lock available now. can be extended. */
#define LOCK_IMAGE 0
-#define LOCK_PREVIEW 1
+#define LOCK_DRAW_IMAGE 1
#define LOCK_VIEWER 2
#define LOCK_CUSTOM1 3
#define LOCK_RCACHE 4
Modified: branches/soc-2011-tomato/source/blender/blenlib/intern/threads.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenlib/intern/threads.c 2012-07-13 13:47:13 UTC (rev 48893)
+++ branches/soc-2011-tomato/source/blender/blenlib/intern/threads.c 2012-07-13 14:21:17 UTC (rev 48894)
@@ -106,7 +106,7 @@
************************************************ */
static pthread_mutex_t _malloc_lock = PTHREAD_MUTEX_INITIALIZER;
static pthread_mutex_t _image_lock = PTHREAD_MUTEX_INITIALIZER;
-static pthread_mutex_t _preview_lock = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t _image_draw_lock = PTHREAD_MUTEX_INITIALIZER;
static pthread_mutex_t _viewer_lock = PTHREAD_MUTEX_INITIALIZER;
static pthread_mutex_t _custom1_lock = PTHREAD_MUTEX_INITIALIZER;
static pthread_mutex_t _rcache_lock = PTHREAD_MUTEX_INITIALIZER;
@@ -337,8 +337,8 @@
{
if (type == LOCK_IMAGE)
pthread_mutex_lock(&_image_lock);
- else if (type == LOCK_PREVIEW)
- pthread_mutex_lock(&_preview_lock);
+ else if (type == LOCK_DRAW_IMAGE)
+ pthread_mutex_lock(&_image_draw_lock);
else if (type == LOCK_VIEWER)
pthread_mutex_lock(&_viewer_lock);
else if (type == LOCK_CUSTOM1)
@@ -357,8 +357,8 @@
{
if (type == LOCK_IMAGE)
pthread_mutex_unlock(&_image_lock);
- else if (type == LOCK_PREVIEW)
- pthread_mutex_unlock(&_preview_lock);
+ else if (type == LOCK_DRAW_IMAGE)
+ pthread_mutex_unlock(&_image_draw_lock);
else if (type == LOCK_VIEWER)
pthread_mutex_unlock(&_viewer_lock);
else if (type == LOCK_CUSTOM1)
Modified: branches/soc-2011-tomato/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.cpp 2012-07-13 13:47:13 UTC (rev 48893)
+++ branches/soc-2011-tomato/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.cpp 2012-07-13 14:21:17 UTC (rev 48894)
@@ -33,7 +33,7 @@
initMutex();
}
-void SingleThreadedNodeOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data)
+void SingleThreadedNodeOperation::executePixel(float *color, int x, int y, void *data)
{
this->m_cachedInstance->readNoCheck(color, x, y);
}
@@ -46,14 +46,14 @@
this->m_cachedInstance = NULL;
}
}
-void *SingleThreadedNodeOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers)
+void *SingleThreadedNodeOperation::initializeTileData(rcti *rect)
{
if (this->m_cachedInstance) return this->m_cachedInstance;
lockMutex();
if (this->m_cachedInstance == NULL) {
//
- this->m_cachedInstance = createMemoryBuffer(rect, memoryBuffers);
+ this->m_cachedInstance = createMemoryBuffer(rect);
}
unlockMutex();
return this->m_cachedInstance;
Modified: branches/soc-2011-tomato/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.h
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.h 2012-07-13 13:47:13 UTC (rev 48893)
+++ branches/soc-2011-tomato/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.h 2012-07-13 14:21:17 UTC (rev 48894)
@@ -39,7 +39,7 @@
/**
* the inner loop of this program
*/
- void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data);
+ void executePixel(float *color, int x, int y, void *data);
/**
* Initialize the execution
@@ -51,9 +51,9 @@
*/
void deinitExecution();
- void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers);
+ void *initializeTileData(rcti *rect);
- virtual MemoryBuffer *createMemoryBuffer(rcti *rect, MemoryBuffer **memoryBuffers) = 0;
+ virtual MemoryBuffer *createMemoryBuffer(rcti *rect) = 0;
int isSingleThreaded() { return true; }
};
Modified: branches/soc-2011-tomato/source/blender/compositor/intern/COM_SocketReader.h
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/intern/COM_SocketReader.h 2012-07-13 13:47:13 UTC (rev 48893)
+++ branches/soc-2011-tomato/source/blender/compositor/intern/COM_SocketReader.h 2012-07-13 14:21:17 UTC (rev 48894)
@@ -63,7 +63,7 @@
* @param y the y-coordinate of the pixel to calculate in image space
* @param inputBuffers chunks that can be read by their ReadBufferOperation.
*/
- virtual void executePixel(float *result, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]) {}
+ virtual void executePixel(float *result, float x, float y, PixelSampler sampler) {}
/**
* @brief calculate a single pixel
@@ -74,8 +74,8 @@
* @param inputBuffers chunks that can be read by their ReadBufferOperation.
* @param chunkData chunk specific data a during execution time.
*/
- virtual void executePixel(float *result, int x, int y, MemoryBuffer *inputBuffers[], void *chunkData) {
- executePixel(result, x, y, COM_PS_NEAREST, inputBuffers);
+ virtual void executePixel(float *result, int x, int y, void *chunkData) {
+ executePixel(result, x, y, COM_PS_NEAREST);
}
/**
@@ -88,21 +88,21 @@
* @param dy
* @param inputBuffers chunks that can be read by their ReadBufferOperation.
*/
- virtual void executePixel(float *result, float x, float y, float dx, float dy, MemoryBuffer *inputBuffers[]) {}
+ virtual void executePixel(float *result, float x, float y, float dx, float dy) {}
public:
- inline void read(float *result, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]) {
- executePixel(result, x, y, sampler, inputBuffers);
+ inline void read(float *result, float x, float y, PixelSampler sampler) {
+ executePixel(result, x, y, sampler);
}
- inline void read(float *result, int x, int y, MemoryBuffer *inputBuffers[], void *chunkData) {
- executePixel(result, x, y, inputBuffers, chunkData);
+ inline void read(float *result, int x, int y, void *chunkData) {
+ executePixel(result, x, y, chunkData);
}
- inline void read(float *result, float x, float y, float dx, float dy, MemoryBuffer *inputBuffers[]) {
- executePixel(result, x, y, dx, dy, inputBuffers);
+ inline void read(float *result, float x, float y, float dx, float dy) {
+ executePixel(result, x, y, dx, dy);
}
- virtual void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers) { return 0; }
- virtual void deinitializeTileData(rcti *rect, MemoryBuffer **memoryBuffers, void *data) {
+ virtual void *initializeTileData(rcti *rect) { return 0; }
+ virtual void deinitializeTileData(rcti *rect, void *data) {
}
virtual MemoryBuffer *getInputMemoryBuffer(MemoryBuffer **memoryBuffers) { return 0; }
Modified: branches/soc-2011-tomato/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp 2012-07-13 13:47:13 UTC (rev 48893)
+++ branches/soc-2011-tomato/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp 2012-07-13 14:21:17 UTC (rev 48894)
@@ -27,15 +27,15 @@
/* pass */
}
-void AlphaOverKeyOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
+void AlphaOverKeyOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler)
{
float inputColor1[4];
float inputOverColor[4];
float value[4];
- this->m_inputValueOperation->read(value, x, y, sampler, inputBuffers);
- this->m_inputColor1Operation->read(inputColor1, x, y, sampler, inputBuffers);
- this->m_inputColor2Operation->read(inputOverColor, x, y, sampler, inputBuffers);
+ this->m_inputValueOperation->read(value, x, y, sampler);
+ this->m_inputColor1Operation->read(inputColor1, x, y, sampler);
+ this->m_inputColor2Operation->read(inputOverColor, x, y, sampler);
if (inputOverColor[3] <= 0.0f) {
copy_v4_v4(outputValue, inputColor1);
Modified: branches/soc-2011-tomato/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h 2012-07-13 13:47:13 UTC (rev 48893)
+++ branches/soc-2011-tomato/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h 2012-07-13 14:21:17 UTC (rev 48894)
@@ -39,6 +39,6 @@
/**
* the inner loop of this program
*/
- void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
+ void executePixel(float *color, float x, float y, PixelSampler sampler);
};
#endif
Modified: branches/soc-2011-tomato/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list