[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49777] branches/soc-2012-fried_chicken: Merge with trunk r49776
Miika Hamalainen
miika.hamalainen at kolumbus.fi
Fri Aug 10 18:23:55 CEST 2012
Revision: 49777
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49777
Author: miikah
Date: 2012-08-10 16:23:54 +0000 (Fri, 10 Aug 2012)
Log Message:
-----------
Merge with trunk r49776
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49776
Modified Paths:
--------------
branches/soc-2012-fried_chicken/CMakeLists.txt
branches/soc-2012-fried_chicken/SConstruct
branches/soc-2012-fried_chicken/build_files/cmake/macros.cmake
branches/soc-2012-fried_chicken/intern/cycles/app/cycles_test.cpp
branches/soc-2012-fried_chicken/intern/cycles/blender/blender_object.cpp
branches/soc-2012-fried_chicken/intern/cycles/blender/blender_particles.cpp
branches/soc-2012-fried_chicken/intern/cycles/blender/blender_sync.h
branches/soc-2012-fried_chicken/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2012-fried_chicken/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2012-fried_chicken/intern/smoke/intern/WAVELET_NOISE.h
branches/soc-2012-fried_chicken/intern/string/STR_HashedString.h
branches/soc-2012-fried_chicken/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
branches/soc-2012-fried_chicken/release/scripts/presets/interaction/blender.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_operators/__init__.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/properties_mask_common.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_image.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_node.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2012-fried_chicken/source/blender/blenkernel/BKE_cloth.h
branches/soc-2012-fried_chicken/source/blender/blenkernel/BKE_context.h
branches/soc-2012-fried_chicken/source/blender/blenkernel/BKE_fcurve.h
branches/soc-2012-fried_chicken/source/blender/blenkernel/BKE_global.h
branches/soc-2012-fried_chicken/source/blender/blenkernel/BKE_mask.h
branches/soc-2012-fried_chicken/source/blender/blenkernel/BKE_node.h
branches/soc-2012-fried_chicken/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/anim.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/blender.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/camera.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/cloth.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/constraint.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/curve.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/displist.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/image.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/implicit.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/mask.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/mask_rasterize.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/mball.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/node.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/object.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/particle.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/particle_system.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/pointcache.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/scene.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/seqcache.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/sequencer.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/softbody.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/sound.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/writeframeserver.c
branches/soc-2012-fried_chicken/source/blender/blenlib/BLI_array.h
branches/soc-2012-fried_chicken/source/blender/blenlib/BLI_utildefines.h
branches/soc-2012-fried_chicken/source/blender/blenlib/intern/math_rotation.c
branches/soc-2012-fried_chicken/source/blender/blenlib/intern/rct.c
branches/soc-2012-fried_chicken/source/blender/blenlib/intern/stack.c
branches/soc-2012-fried_chicken/source/blender/blenloader/intern/readfile.c
branches/soc-2012-fried_chicken/source/blender/blenloader/intern/versioning_250.c
branches/soc-2012-fried_chicken/source/blender/compositor/CMakeLists.txt
branches/soc-2012-fried_chicken/source/blender/compositor/COM_defines.h
branches/soc-2012-fried_chicken/source/blender/compositor/SConscript
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_Converter.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_ExecutionGroup.h
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_InputSocket.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_InputSocket.h
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_MemoryBuffer.h
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_NodeOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_NodeOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_OutputSocket.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_OutputSocket.h
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_Socket.h
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_SocketReader.h
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_DefocusNode.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_MuteNode.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_AntiAliasOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_AntiAliasOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_BilateralBlurOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_BokehBlurOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_BokehImageOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_BokehImageOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_BoxMaskOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_BoxMaskOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_BrightnessOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_BrightnessOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_CalculateMeanOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_CalculateMeanOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ChangeHSVOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ChangeHSVOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ChannelMatteOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ChannelMatteOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ChromaMatteOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ChromaMatteOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ColorCorrectionOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ColorCurveOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ColorCurveOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ColorMatteOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ColorMatteOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ColorRampOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ColorRampOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ColorSpillOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ColorSpillOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_CombineChannelsOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_CompositorOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_CompositorOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertColorProfileOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertColorToValueProg.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertColorToValueProg.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertValueToColorProg.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertValueToColorProg.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_CropOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_CropOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_DifferenceMatteOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_DilateErodeOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_DisplaceOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_DisplaceOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_DisplaceSimpleOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_DistanceMatteOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_DistanceMatteOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_DotproductOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_DotproductOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_EllipseMaskOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_FlipOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_FlipOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_GammaCorrectOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_GammaCorrectOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_GammaOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_GammaOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_GaussianXBlurOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_GaussianYBlurOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_GlareThresholdOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_GlareThresholdOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_IDMaskOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_IDMaskOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ImageOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ImageOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_InvertOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_InvertOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_KeyingBlurOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_KeyingBlurOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_KeyingClipOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_KeyingClipOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_KeyingDespillOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_KeyingDespillOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_KeyingOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_KeyingOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_KeyingScreenOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_LuminanceMatteOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MapUVOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MapUVOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MapValueOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MapValueOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MaskOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MaskOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MathBaseOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MathBaseOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixAddOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixAddOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixBaseOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixBaseOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixBlendOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixBlendOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixBurnOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixBurnOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixColorOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixColorOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixDarkenOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixDifferenceOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixDivideOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixDivideOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixDodgeOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixDodgeOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixGlareOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixGlareOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixHueOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixHueOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixLightenOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixLightenOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixLinearLightOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixMultiplyOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixMultiplyOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixOverlayOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixSaturationOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixScreenOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixScreenOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixSoftLightOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixSubtractOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixValueOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixValueOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MovieClipOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MovieClipOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MovieDistortionOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MultilayerImageOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_NormalizeOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_NormalizeOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_OpenCLKernels.cl
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_PreviewOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_PreviewOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ReadBufferOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ReadBufferOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_RenderLayersAlphaProg.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_RenderLayersAlphaProg.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_RenderLayersBaseProg.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_RotateOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_RotateOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ScaleOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ScaleOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_SeparateChannelOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_SeparateChannelOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_SetAlphaOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_SetAlphaOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_SetColorOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_SetColorOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_SetSamplerOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_SetSamplerOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_SetValueOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_SetValueOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_SetVectorOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_SetVectorOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_SocketProxyOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_SocketProxyOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_TextureOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_TextureOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_TonemapOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_TonemapOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_TrackPositionOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_TrackPositionOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_TranslateOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_TranslateOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_VectorBlurOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_VectorCurveOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_VectorCurveOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_WriteBufferOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ZCombineOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ZCombineOperation.h
branches/soc-2012-fried_chicken/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2012-fried_chicken/source/blender/editors/animation/anim_deps.c
branches/soc-2012-fried_chicken/source/blender/editors/animation/anim_draw.c
branches/soc-2012-fried_chicken/source/blender/editors/animation/anim_filter.c
branches/soc-2012-fried_chicken/source/blender/editors/animation/anim_markers.c
branches/soc-2012-fried_chicken/source/blender/editors/animation/anim_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/interface/interface_anim.c
branches/soc-2012-fried_chicken/source/blender/editors/interface/interface_templates.c
branches/soc-2012-fried_chicken/source/blender/editors/interface/resources.c
branches/soc-2012-fried_chicken/source/blender/editors/interface/view2d_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/mask/mask_add.c
branches/soc-2012-fried_chicken/source/blender/editors/mask/mask_draw.c
branches/soc-2012-fried_chicken/source/blender/editors/mask/mask_select.c
branches/soc-2012-fried_chicken/source/blender/editors/mesh/editface.c
branches/soc-2012-fried_chicken/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2012-fried_chicken/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2012-fried_chicken/source/blender/editors/object/object_bake.c
branches/soc-2012-fried_chicken/source/blender/editors/object/object_modifier.c
branches/soc-2012-fried_chicken/source/blender/editors/object/object_select.c
branches/soc-2012-fried_chicken/source/blender/editors/physics/dynamicpaint_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/physics/physics_fluid.c
branches/soc-2012-fried_chicken/source/blender/editors/physics/physics_pointcache.c
branches/soc-2012-fried_chicken/source/blender/editors/render/render_internal.c
branches/soc-2012-fried_chicken/source/blender/editors/render/render_opengl.c
branches/soc-2012-fried_chicken/source/blender/editors/render/render_preview.c
branches/soc-2012-fried_chicken/source/blender/editors/render/render_view.c
branches/soc-2012-fried_chicken/source/blender/editors/screen/area.c
branches/soc-2012-fried_chicken/source/blender/editors/screen/screen_edit.c
branches/soc-2012-fried_chicken/source/blender/editors/screen/screen_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/sculpt_paint/paint_hide.c
branches/soc-2012-fried_chicken/source/blender/editors/space_action/action_select.c
branches/soc-2012-fried_chicken/source/blender/editors/space_clip/clip_graph_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/space_clip/clip_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/space_clip/tracking_select.c
branches/soc-2012-fried_chicken/source/blender/editors/space_file/file_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/space_file/filelist.c
branches/soc-2012-fried_chicken/source/blender/editors/space_file/space_file.c
branches/soc-2012-fried_chicken/source/blender/editors/space_graph/graph_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/space_graph/graph_select.c
branches/soc-2012-fried_chicken/source/blender/editors/space_image/image_buttons.c
branches/soc-2012-fried_chicken/source/blender/editors/space_image/space_image.c
branches/soc-2012-fried_chicken/source/blender/editors/space_info/info_report.c
branches/soc-2012-fried_chicken/source/blender/editors/space_logic/logic_window.c
branches/soc-2012-fried_chicken/source/blender/editors/space_nla/nla_channels.c
branches/soc-2012-fried_chicken/source/blender/editors/space_nla/nla_select.c
branches/soc-2012-fried_chicken/source/blender/editors/space_node/drawnode.c
branches/soc-2012-fried_chicken/source/blender/editors/space_node/node_add.c
branches/soc-2012-fried_chicken/source/blender/editors/space_node/node_buttons.c
branches/soc-2012-fried_chicken/source/blender/editors/space_node/node_draw.c
branches/soc-2012-fried_chicken/source/blender/editors/space_node/node_edit.c
branches/soc-2012-fried_chicken/source/blender/editors/space_node/node_group.c
branches/soc-2012-fried_chicken/source/blender/editors/space_node/node_header.c
branches/soc-2012-fried_chicken/source/blender/editors/space_node/node_intern.h
branches/soc-2012-fried_chicken/source/blender/editors/space_node/node_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/space_node/node_relationships.c
branches/soc-2012-fried_chicken/source/blender/editors/space_node/node_select.c
branches/soc-2012-fried_chicken/source/blender/editors/space_node/node_view.c
branches/soc-2012-fried_chicken/source/blender/editors/space_node/space_node.c
branches/soc-2012-fried_chicken/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2012-fried_chicken/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2012-fried_chicken/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2012-fried_chicken/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2012-fried_chicken/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/drawobject.c
branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2012-fried_chicken/source/blender/editors/transform/transform.c
branches/soc-2012-fried_chicken/source/blender/editors/transform/transform.h
branches/soc-2012-fried_chicken/source/blender/editors/transform/transform_conversions.c
branches/soc-2012-fried_chicken/source/blender/editors/transform/transform_manipulator.c
branches/soc-2012-fried_chicken/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2012-fried_chicken/source/blender/editors/uvedit/uvedit_parametrizer.h
branches/soc-2012-fried_chicken/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2012-fried_chicken/source/blender/imbuf/IMB_imbuf.h
branches/soc-2012-fried_chicken/source/blender/imbuf/IMB_moviecache.h
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/filter.c
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/imageprocess.c
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/moviecache.c
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/scaling.c
branches/soc-2012-fried_chicken/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2012-fried_chicken/source/blender/makesdna/DNA_mask_types.h
branches/soc-2012-fried_chicken/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2012-fried_chicken/source/blender/makesdna/DNA_node_types.h
branches/soc-2012-fried_chicken/source/blender/makesdna/DNA_space_types.h
branches/soc-2012-fried_chicken/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2012-fried_chicken/source/blender/makesrna/RNA_access.h
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_access.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_mask.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_nodetree_types.h
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_scene.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_screen.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_sequencer_api.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_space.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2012-fried_chicken/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2012-fried_chicken/source/blender/modifiers/intern/MOD_collision.c
branches/soc-2012-fried_chicken/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2012-fried_chicken/source/blender/nodes/CMakeLists.txt
branches/soc-2012-fried_chicken/source/blender/nodes/NOD_composite.h
branches/soc-2012-fried_chicken/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/soc-2012-fried_chicken/source/blender/nodes/intern/node_common.c
branches/soc-2012-fried_chicken/source/blender/nodes/intern/node_common.h
branches/soc-2012-fried_chicken/source/blender/nodes/intern/node_util.c
branches/soc-2012-fried_chicken/source/blender/nodes/shader/node_shader_tree.c
branches/soc-2012-fried_chicken/source/blender/nodes/texture/node_texture_tree.c
branches/soc-2012-fried_chicken/source/blender/python/intern/bpy_app.c
branches/soc-2012-fried_chicken/source/blender/python/intern/bpy_props.c
branches/soc-2012-fried_chicken/source/blender/python/intern/bpy_rna.c
branches/soc-2012-fried_chicken/source/blender/render/intern/source/convertblender.c
branches/soc-2012-fried_chicken/source/blender/render/intern/source/external_engine.c
branches/soc-2012-fried_chicken/source/blender/render/intern/source/pipeline.c
branches/soc-2012-fried_chicken/source/blender/render/intern/source/render_texture.c
branches/soc-2012-fried_chicken/source/blender/render/intern/source/shadbuf.c
branches/soc-2012-fried_chicken/source/blender/render/intern/source/texture_ocean.c
branches/soc-2012-fried_chicken/source/blender/render/intern/source/zbuf.c
branches/soc-2012-fried_chicken/source/blender/windowmanager/CMakeLists.txt
branches/soc-2012-fried_chicken/source/blender/windowmanager/WM_api.h
branches/soc-2012-fried_chicken/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2012-fried_chicken/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2012-fried_chicken/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2012-fried_chicken/source/blenderplayer/CMakeLists.txt
branches/soc-2012-fried_chicken/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2012-fried_chicken/source/creator/CMakeLists.txt
branches/soc-2012-fried_chicken/source/creator/creator.c
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_PythonInit.cpp
Added Paths:
-----------
branches/soc-2012-fried_chicken/build_files/cmake/data_to_c.cmake
branches/soc-2012-fried_chicken/release/scripts/startup/bl_operators/node.py
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_InpaintNode.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_InpaintNode.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_InpaintOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_InpaintOperation.h
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_inpaint.c
branches/soc-2012-fried_chicken/source/blender/windowmanager/intern/wm_playanim.c
Removed Paths:
-------------
branches/soc-2012-fried_chicken/release/datafiles/clkernelstoh.py
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_OpenCLKernels.cl.h
Property Changed:
----------------
branches/soc-2012-fried_chicken/
branches/soc-2012-fried_chicken/source/blender/editors/space_outliner/
Property changes on: branches/soc-2012-fried_chicken
___________________________________________________________________
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:46807-49600
+ /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:46807-49776
Modified: branches/soc-2012-fried_chicken/CMakeLists.txt
===================================================================
--- branches/soc-2012-fried_chicken/CMakeLists.txt 2012-08-10 16:07:13 UTC (rev 49776)
+++ branches/soc-2012-fried_chicken/CMakeLists.txt 2012-08-10 16:23:54 UTC (rev 49777)
@@ -247,7 +247,7 @@
option(WITH_CYCLES_TEST "Build cycles test application" OFF)
option(WITH_CYCLES_OSL "Build Cycles with OSL support" OFF)
option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF)
-set(CYCLES_CUDA_BINARIES_ARCH sm_13 sm_20 sm_21 CACHE STRING "CUDA architectures to build binaries for")
+set(CYCLES_CUDA_BINARIES_ARCH sm_13 sm_20 sm_21 sm_30 CACHE STRING "CUDA architectures to build binaries for")
mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
unset(PLATFORM_DEFAULT)
@@ -271,7 +271,9 @@
endif()
execute_process(COMMAND uname -r OUTPUT_VARIABLE MAC_SYS) # check for actual system-version
- if (${MAC_SYS} MATCHES 11)
+ if (${MAC_SYS} MATCHES 12)
+ set(OSX_SYSTEM 10.8)
+ elseif (${MAC_SYS} MATCHES 11)
set(OSX_SYSTEM 10.7)
elseif(${MAC_SYS} MATCHES 10)
set(OSX_SYSTEM 10.6)
@@ -1481,6 +1483,16 @@
if(MSVC)
# for some reason this fails on msvc
add_definitions(-D__LITTLE_ENDIAN__)
+
+# OSX-Note: as we do crosscompiling with specific set architecture,
+# endianess-detection and autosetting is counterproductive
+# so we just set endianess according CMAKE_OSX_ARCHITECTURES
+
+elseif(CMAKE_OSX_ARCHITECTURES MATCHES i386 OR CMAKE_OSX_ARCHITECTURES MATCHES x86_64)
+ add_definitions(-D__LITTLE_ENDIAN__)
+elseif(CMAKE_OSX_ARCHITECTURES MATCHES ppc OR CMAKE_OSX_ARCHITECTURES MATCHES ppc64)
+ add_definitions(-D__BIG_ENDIAN__)
+
else()
include(TestBigEndian)
test_big_endian(_SYSTEM_BIG_ENDIAN)
Modified: branches/soc-2012-fried_chicken/SConstruct
===================================================================
--- branches/soc-2012-fried_chicken/SConstruct 2012-08-10 16:07:13 UTC (rev 49776)
+++ branches/soc-2012-fried_chicken/SConstruct 2012-08-10 16:23:54 UTC (rev 49777)
@@ -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):
@@ -445,9 +445,53 @@
# if not os.path.isdir(B.doc_build_dir) and env['WITH_BF_DOCS']:
# os.makedirs ( B.doc_build_dir )
+###################################
+# 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' )
+# use for includes
+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("/", "\\")
+ 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
+
+ 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)
+
+ 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")
+
+ 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")
+
+##### 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']:
@@ -534,7 +578,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']
@@ -611,13 +655,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:
@@ -630,7 +674,7 @@
pass
else:
continue
-
+
dir = os.path.join(env['BF_INSTALLDIR'], VERSION)
dir += os.sep + os.path.basename(intpath) + dp[len(intpath):]
@@ -738,7 +782,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':
@@ -751,7 +795,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')
@@ -770,10 +814,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')
Copied: branches/soc-2012-fried_chicken/build_files/cmake/data_to_c.cmake (from rev 49774, trunk/blender/build_files/cmake/data_to_c.cmake)
===================================================================
--- branches/soc-2012-fried_chicken/build_files/cmake/data_to_c.cmake (rev 0)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list