[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50007] branches/soc-2012-bratwurst: svn merge ^/trunk/blender -r49750:49800
Campbell Barton
ideasman42 at gmail.com
Sun Aug 19 12:54:08 CEST 2012
Revision: 50007
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50007
Author: campbellbarton
Date: 2012-08-19 10:54:07 +0000 (Sun, 19 Aug 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r49750:49800
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49750
Modified Paths:
--------------
branches/soc-2012-bratwurst/SConstruct
branches/soc-2012-bratwurst/build_files/cmake/Modules/FindOpenCOLLADA.cmake
branches/soc-2012-bratwurst/build_files/cmake/macros.cmake
branches/soc-2012-bratwurst/intern/cycles/blender/blender_object.cpp
branches/soc-2012-bratwurst/intern/cycles/blender/blender_particles.cpp
branches/soc-2012-bratwurst/intern/cycles/blender/blender_sync.h
branches/soc-2012-bratwurst/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2012-bratwurst/intern/guardedalloc/intern/mallocn.c
branches/soc-2012-bratwurst/intern/smoke/intern/WAVELET_NOISE.h
branches/soc-2012-bratwurst/release/datafiles/preview.blend
branches/soc-2012-bratwurst/release/scripts/presets/interaction/blender.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_operators/node.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2012-bratwurst/source/blender/avi/intern/avi.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/sequencer.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/math_rotation.c
branches/soc-2012-bratwurst/source/blender/compositor/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/compositor/COM_defines.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_ExecutionGroup.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_InputSocket.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_InputSocket.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_MemoryBuffer.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_NodeOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_NodeOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_OutputSocket.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_OutputSocket.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_Socket.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_SocketReader.h
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_AntiAliasOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_AntiAliasOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BilateralBlurOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BokehBlurOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BokehImageOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BokehImageOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BoxMaskOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BoxMaskOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BrightnessOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BrightnessOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_CalculateMeanOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_CalculateMeanOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ChangeHSVOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ChangeHSVOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ChannelMatteOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ChannelMatteOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ChromaMatteOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ChromaMatteOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorCorrectionOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorCurveOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorCurveOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorMatteOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorMatteOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorRampOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorRampOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorSpillOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorSpillOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_CombineChannelsOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_CompositorOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_CompositorOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertColorProfileOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertColorToValueProg.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertColorToValueProg.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertValueToColorProg.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertValueToColorProg.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_CropOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_CropOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DifferenceMatteOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DilateErodeOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DisplaceOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DisplaceOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DisplaceSimpleOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DistanceMatteOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DistanceMatteOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DotproductOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DotproductOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_EllipseMaskOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_FlipOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_FlipOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GammaCorrectOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GammaCorrectOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GammaOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GammaOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianXBlurOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianYBlurOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GlareThresholdOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GlareThresholdOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_IDMaskOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_IDMaskOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ImageOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ImageOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_InpaintOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_InpaintOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_InvertOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_InvertOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_KeyingBlurOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_KeyingBlurOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_KeyingClipOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_KeyingClipOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_KeyingDespillOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_KeyingDespillOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_KeyingOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_KeyingOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_KeyingScreenOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_LuminanceMatteOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MapUVOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MapUVOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MapValueOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MapValueOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MaskOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MaskOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MathBaseOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MathBaseOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixAddOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixAddOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixBaseOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixBaseOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixBlendOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixBlendOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixBurnOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixBurnOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixColorOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixColorOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixDarkenOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixDifferenceOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixDivideOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixDivideOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixDodgeOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixDodgeOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixGlareOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixGlareOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixHueOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixHueOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixLightenOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixLightenOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixLinearLightOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixMultiplyOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixMultiplyOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixOverlayOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixSaturationOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixScreenOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixScreenOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixSoftLightOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixSubtractOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixValueOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixValueOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MovieClipOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MovieClipOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MovieDistortionOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MultilayerImageOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_NormalizeOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_NormalizeOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_OpenCLKernels.cl
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_PreviewOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_PreviewOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ReadBufferOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ReadBufferOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RenderLayersAlphaProg.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RenderLayersAlphaProg.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RenderLayersBaseProg.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RotateOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RotateOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ScaleOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ScaleOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SeparateChannelOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SeparateChannelOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SetAlphaOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SetAlphaOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SetColorOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SetColorOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SetSamplerOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SetSamplerOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SetValueOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SetValueOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SetVectorOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SetVectorOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SocketProxyOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SocketProxyOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_TextureOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_TextureOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_TonemapOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_TonemapOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_TrackPositionOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_TrackPositionOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_TranslateOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_TranslateOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_VectorBlurOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_VectorCurveOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_VectorCurveOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_WriteBufferOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ZCombineOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ZCombineOperation.h
branches/soc-2012-bratwurst/source/blender/editors/datafiles/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/editors/datafiles/SConscript
branches/soc-2012-bratwurst/source/blender/editors/include/ED_screen_types.h
branches/soc-2012-bratwurst/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2012-bratwurst/source/blender/editors/screen/area.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2012-bratwurst/source/blender/windowmanager/WM_types.h
Added Paths:
-----------
branches/soc-2012-bratwurst/release/datafiles/startup.blend
Removed Paths:
-------------
branches/soc-2012-bratwurst/source/blender/editors/datafiles/preview.blend.c
branches/soc-2012-bratwurst/source/blender/editors/datafiles/startup.blend.c
Property Changed:
----------------
branches/soc-2012-bratwurst/
branches/soc-2012-bratwurst/build_files/cmake/data_to_c.cmake
branches/soc-2012-bratwurst/source/blender/editors/interface/interface.c
branches/soc-2012-bratwurst/source/blender/editors/space_outliner/
Property changes on: branches/soc-2012-bratwurst
___________________________________________________________________
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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466
/trunk/blender:46808-49750
+ /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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466
/trunk/blender:46808-49800
Modified: branches/soc-2012-bratwurst/SConstruct
===================================================================
--- branches/soc-2012-bratwurst/SConstruct 2012-08-19 10:41:27 UTC (rev 50006)
+++ branches/soc-2012-bratwurst/SConstruct 2012-08-19 10:54:07 UTC (rev 50007)
@@ -92,7 +92,7 @@
if not use_color=='1':
B.bc.disable()
-
+
#on defaut white Os X terminal, some colors are totally unlegible
if platform=='darwin':
B.bc.OKGREEN = '\033[34m'
@@ -123,8 +123,8 @@
B.bitness = bitness
else:
B.bitness = tempbitness
-
+
# first check cmdline for toolset and we create env to work on
quickie = B.arguments.get('BF_QUICK', None)
quickdebug = B.arguments.get('BF_QUICKDEBUG', None)
@@ -138,7 +138,7 @@
B.quickie=string.split(quickie,',')
else:
B.quickie=[]
-
+
toolset = B.arguments.get('BF_TOOLSET', None)
if toolset:
print "Using " + toolset
@@ -270,7 +270,7 @@
target_env_defs['WITH_BF_PYTHON'] = False
target_env_defs['WITH_BF_3DMOUSE'] = False
target_env_defs['WITH_BF_LIBMV'] = False
-
+
# Merge blenderlite, let command line to override
for k,v in target_env_defs.iteritems():
if k not in B.arguments:
@@ -319,7 +319,7 @@
if env['WITH_GHOST_COCOA'] == True:
env.Append(CPPFLAGS=['-DGHOST_COCOA'])
-
+
if env['USE_QTKIT'] == True:
env.Append(CPPFLAGS=['-DUSE_QTKIT'])
@@ -374,7 +374,7 @@
B.root_build_dir += os.sep
if not B.doc_build_dir[-1]==os.sep:
B.doc_build_dir += os.sep
-
+
# We do a shortcut for clean when no quicklist is given: just delete
# builddir without reading in SConscripts
do_clean = None
@@ -422,16 +422,16 @@
# with _any_ library but since we used a fixed python version this tends to
# be most problematic.
if env['WITH_BF_PYTHON']:
- py_h = os.path.join(Dir(env.subst('${BF_PYTHON_INC}')).abspath, "Python.h")
+ py_h = os.path.join(Dir(env.subst('${BF_PYTHON_INC}')).abspath, "Python.h")
- if not os.path.exists(py_h):
- print("\nMissing: \"" + env.subst('${BF_PYTHON_INC}') + os.sep + "Python.h\",\n"
- " Set 'BF_PYTHON_INC' to point "
- "to a valid python include path.\n Containing "
- "Python.h for python version \"" + env.subst('${BF_PYTHON_VERSION}') + "\"")
+ if not os.path.exists(py_h):
+ print("\nMissing: \"" + env.subst('${BF_PYTHON_INC}') + os.sep + "Python.h\",\n"
+ " Set 'BF_PYTHON_INC' to point "
+ "to a valid python include path.\n Containing "
+ "Python.h for python version \"" + env.subst('${BF_PYTHON_VERSION}') + "\"")
- Exit()
- del py_h
+ Exit()
+ del py_h
if not os.path.isdir ( B.root_build_dir):
@@ -449,49 +449,60 @@
# Ensure all data files are valid #
###################################
if not os.path.isdir ( B.root_build_dir + 'data_headers'):
- os.makedirs ( B.root_build_dir + 'data_headers' )
+ os.makedirs ( B.root_build_dir + 'data_headers' )
+if not os.path.isdir ( B.root_build_dir + 'data_sources'):
+ os.makedirs ( B.root_build_dir + 'data_sources' )
# 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")
+env['DATA_SOURCES'] = os.path.join(os.path.abspath(env['BF_BUILDDIR']), "data_sources")
def ensure_data(FILE_FROM, FILE_TO, VAR_NAME):
- if os.sep == "\\":
- FILE_FROM = FILE_FROM.replace("/", "\\")
- FILE_TO = FILE_TO.replace("/", "\\")
+ if os.sep == "\\":
+ FILE_FROM = FILE_FROM.replace("/", "\\")
+ FILE_TO = FILE_TO.replace("/", "\\")
- # first check if we need to bother.
- if os.path.exists(FILE_TO):
- if os.path.getmtime(FILE_FROM) < os.path.getmtime(FILE_TO):
- return
+ # first check if we need to bother.
+ if os.path.exists(FILE_TO):
+ if os.path.getmtime(FILE_FROM) < os.path.getmtime(FILE_TO):
+ return
- print(B.bc.HEADER + "Generating: " + B.bc.ENDC + "%r" % os.path.basename(FILE_TO))
- fpin = open(FILE_FROM, "rb")
- fpin.seek(0, os.SEEK_END)
- size = fpin.tell()
- fpin.seek(0)
+ print(B.bc.HEADER + "Generating: " + B.bc.ENDC + "%r" % os.path.basename(FILE_TO))
+ fpin = open(FILE_FROM, "rb")
+ fpin.seek(0, os.SEEK_END)
+ size = fpin.tell()
+ fpin.seek(0)
- fpout = open(FILE_TO, "w")
- fpout.write("int %s_size = %d;\n" % (VAR_NAME, size))
- fpout.write("char %s[] = {\n" % VAR_NAME)
+ fpout = open(FILE_TO, "w")
+ fpout.write("int %s_size = %d;\n" % (VAR_NAME, size))
+ fpout.write("char %s[] = {\n" % VAR_NAME)
- while size > 0:
- size -= 1
- if size % 32 == 31:
- fpout.write("\n")
+ while size > 0:
+ size -= 1
+ if size % 32 == 31:
+ fpout.write("\n")
- fpout.write("%3d," % ord(fpin.read(1)))
- fpout.write("\n 0};\n\n")
+ fpout.write("%3d," % ord(fpin.read(1)))
+ fpout.write("\n 0};\n\n")
- fpin.close()
- fpout.close()
+ fpin.close()
+ fpout.close()
ensure_data("source/blender/compositor/operations/COM_OpenCLKernels.cl",
B.root_build_dir + "data_headers/COM_OpenCLKernels.cl.h",
"clkernelstoh_COM_OpenCLKernels_cl")
+ensure_data("./release/datafiles/startup.blend",
+ B.root_build_dir + "data_sources/startup.blend.c",
+ "datatoc_startup_blend")
+
+ensure_data("./release/datafiles/preview.blend",
+ B.root_build_dir + "data_sources/preview.blend.c",
+ "datatoc_preview_blend")
+
##### END DATAFILES ##########
Help(opts.GenerateHelpText(env))
-# default is new quieter output, but if you need to see the
+# default is new quieter output, but if you need to see the
# commands, do 'scons BF_QUIET=0'
bf_quietoutput = B.arguments.get('BF_QUIET', '1')
if env['BF_QUIET']:
@@ -578,7 +589,7 @@
for targetdir,srcfile in zip(datafilestargetlist, datafileslist):
td, tf = os.path.split(targetdir)
dotblenderinstall.append(env.Install(dir=td, source=srcfile))
-
+
if env['WITH_BF_PYTHON']:
#-- local/VERSION/scripts
scriptpaths=['release/scripts']
@@ -655,13 +666,13 @@
kernel_build_dir = os.path.join(B.root_build_dir, 'intern/cycles/kernel')
cubin_file = os.path.join(kernel_build_dir, "kernel_%s.cubin" % arch)
scriptinstall.append(env.Install(dir=dir,source=cubin_file))
-
+
if env['WITH_BF_INTERNATIONAL']:
internationalpaths=['release' + os.sep + 'datafiles']
-
+
def check_path(path, member):
return (member in path.split(os.sep))
-
+
for intpath in internationalpaths:
for dp, dn, df in os.walk(intpath):
if '.svn' in dn:
@@ -674,7 +685,7 @@
pass
else:
continue
-
+
dir = os.path.join(env['BF_INSTALLDIR'], VERSION)
dir += os.sep + os.path.basename(intpath) + dp[len(intpath):]
@@ -782,7 +793,7 @@
# strict: the x86 build fails on x64 Windows. We need to ship
# both builds in x86 packages.
if bitness == 32:
- dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb.dll')
+ dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb.dll')
dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb64.dll')
if env['WITH_BF_OIIO'] and env['OURPLATFORM'] != 'win32-mingw':
@@ -795,7 +806,7 @@
if env['OURPLATFORM'] == 'win64-mingw':
dllsources = []
-
+
if env['WITH_BF_PYTHON']:
if env['BF_DEBUG']:
dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_DLL}_d.dll')
@@ -814,10 +825,10 @@
if env['WITH_BF_SDL']:
dllsources.append('${LCGDIR}/sdl/lib/SDL.dll')
-
- if(env['WITH_BF_OPENMP']):
- dllsources.append('${LCGDIR}/binaries/libgomp-1.dll')
-
+
+ if(env['WITH_BF_OPENMP']):
+ dllsources.append('${LCGDIR}/binaries/libgomp-1.dll')
+
dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb64.dll')
dllsources.append('${LCGDIR}/binaries/libgcc_s_sjlj-1.dll')
dllsources.append('${LCGDIR}/binaries/libwinpthread-1.dll')
Modified: branches/soc-2012-bratwurst/build_files/cmake/Modules/FindOpenCOLLADA.cmake
===================================================================
--- branches/soc-2012-bratwurst/build_files/cmake/Modules/FindOpenCOLLADA.cmake 2012-08-19 10:41:27 UTC (rev 50006)
+++ branches/soc-2012-bratwurst/build_files/cmake/Modules/FindOpenCOLLADA.cmake 2012-08-19 10:54:07 UTC (rev 50007)
@@ -81,6 +81,7 @@
# Alternative would be to suffix all members of search path
# but this is less trouble, just looks strange.
include/opencollada/${COMPONENT}
+ include/${COMPONENT}/include
HINTS
${_opencollada_SEARCH_DIRS}
)
Property changes on: branches/soc-2012-bratwurst/build_files/cmake/data_to_c.cmake
___________________________________________________________________
Added: svn:eol-style
+ native
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list