[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48083] branches/soc-2012-bratwurst: merge with trunk 48082
Antony Riakiotakis
kalast at gmail.com
Tue Jun 19 17:01:31 CEST 2012
Revision: 48083
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48083
Author: psy-fi
Date: 2012-06-19 15:01:28 +0000 (Tue, 19 Jun 2012)
Log Message:
-----------
merge with trunk 48082
Modified Paths:
--------------
branches/soc-2012-bratwurst/doc/python_api/examples/bpy.types.Object.py
branches/soc-2012-bratwurst/doc/python_api/examples/bpy.types.Panel.1.py
branches/soc-2012-bratwurst/doc/python_api/rst/bge.types.rst
branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/CMakeLists.txt
branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/SConscript
branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/bundle.sh
branches/soc-2012-bratwurst/extern/recastnavigation/Recast/Include/RecastAssert.h
branches/soc-2012-bratwurst/extern/recastnavigation/recast-capi.cpp
branches/soc-2012-bratwurst/intern/audaspace/Python/AUD_PyAPI.cpp
branches/soc-2012-bratwurst/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
branches/soc-2012-bratwurst/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
branches/soc-2012-bratwurst/intern/bsp/test/BSP_GhostTest/plyfile.c
branches/soc-2012-bratwurst/intern/cycles/blender/addon/ui.py
branches/soc-2012-bratwurst/intern/cycles/kernel/kernel_path.h
branches/soc-2012-bratwurst/intern/elbeem/intern/controlparticles.cpp
branches/soc-2012-bratwurst/intern/ffmpeg/ffmpeg_compat.h
branches/soc-2012-bratwurst/intern/ghost/CMakeLists.txt
branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2012-bratwurst/intern/ghost/test/gears/GHOST_C-Test.c
branches/soc-2012-bratwurst/intern/ghost/test/gears/GHOST_Test.cpp
branches/soc-2012-bratwurst/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
branches/soc-2012-bratwurst/intern/raskter/raskter.c
branches/soc-2012-bratwurst/release/scripts/presets/operator/wm.collada_export/second_life.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2012-bratwurst/source/blender/avi/intern/avi.c
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_blender.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_node.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_tracking.h
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/cloth.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/collision.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/constraint.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/curve.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/implicit.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/lattice.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/mask.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/mesh.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/movieclip.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/node.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/paint.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/particle_system.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/smoke.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/tracking.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2012-bratwurst/source/blender/blenlib/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/blenlib/intern/fnmatch.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/string_utf8.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/threads.c
branches/soc-2012-bratwurst/source/blender/blenloader/intern/readfile.c
branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_operators.h
branches/soc-2012-bratwurst/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2012-bratwurst/source/blender/collada/AnimationExporter.cpp
branches/soc-2012-bratwurst/source/blender/collada/ArmatureExporter.cpp
branches/soc-2012-bratwurst/source/blender/collada/ArmatureExporter.h
branches/soc-2012-bratwurst/source/blender/collada/ArmatureImporter.cpp
branches/soc-2012-bratwurst/source/blender/collada/DocumentImporter.cpp
branches/soc-2012-bratwurst/source/blender/collada/ExportSettings.h
branches/soc-2012-bratwurst/source/blender/collada/GeometryExporter.cpp
branches/soc-2012-bratwurst/source/blender/collada/MaterialExporter.cpp
branches/soc-2012-bratwurst/source/blender/collada/SceneExporter.cpp
branches/soc-2012-bratwurst/source/blender/collada/collada.cpp
branches/soc-2012-bratwurst/source/blender/collada/collada.h
branches/soc-2012-bratwurst/source/blender/collada/collada_utils.cpp
branches/soc-2012-bratwurst/source/blender/collada/collada_utils.h
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_CPUDevice.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_ChannelInfo.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_ChunkOrder.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_ChunkOrderHotspot.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_Converter.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_ExecutionSystem.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
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.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_Node.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_NodeBase.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_NodeBase.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_NodeOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_OpenCLDevice.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_OpenCLDevice.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_Socket.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_Socket.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_SocketConnection.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_AlphaOverNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_BlurNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_BokehImageNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_BoxMaskNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_BrightnessNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_ColorCurveNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_ColorMatteNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_ColorNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_ColorRampNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_ColorSpillNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_ColorToBWNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_CombineHSVANode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_CombineRGBANode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_CombineYCCANode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_CombineYUVANode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_CompositorNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_CropNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_DefocusNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_DilateErodeNode.h
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_DisplaceNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_FilterNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_FlipNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_GammaNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_GlareNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_GroupNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_IDMaskNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_ImageNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_InvertNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_LensDistortionNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_MapUVNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_MapValueNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_MaskNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_MathNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_MixNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_MovieClipNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_MuteNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_NormalNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_NormalizeNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_OutputFileNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_RotateNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_ScaleNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_SeparateHSVANode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_SeparateRGBANode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_SeparateYCCANode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_SeparateYUVANode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_SetAlphaNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_SwitchNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_TextureNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_TimeNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_TonemapNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_TransformNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_TranslateNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_ValueNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_VectorBlurNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_VectorCurveNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_ViewerNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_ZCombineNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_AntiAliasOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BlurBaseOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BokehImageOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BoxMaskOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BrightnessOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_CalculateMeanOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ChangeHSVOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ChannelMatteOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ChromaMatteOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorCurveOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorMatteOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorRampOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorSpillOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertColorProfileOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertColourToValueProg.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertValueToColourProg.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_CropOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_CurveBaseOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DisplaceOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DistanceMatteOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DotproductOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp
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_GammaCorrectOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GammaOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
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_GlareBaseOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GlareGhostOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_IDMaskOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ImageOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_InvertOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MapUVOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MapValueOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MaskOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MathBaseOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixAddOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixBaseOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixBlendOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixBurnOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixColorOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixDivideOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixDodgeOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixGlareOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixHueOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixLightenOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixMultiplyOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixScreenOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixValueOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MovieClipOperation.cpp
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_NormalizeOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_OpenCLKernels.cl
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_OpenCLKernels.cl.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_OutputFileOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_PreviewOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_QualityStepHelper.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ReadBufferOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RenderLayersAOOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RenderLayersAlphaProg.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RenderLayersColorOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RenderLayersCyclesOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RenderLayersDepthProg.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RenderLayersDiffuseOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RenderLayersEmitOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RenderLayersEnvironmentOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RenderLayersImageProg.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RenderLayersIndirectOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RenderLayersMaterialIndexOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RenderLayersMistOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RenderLayersNormalOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RenderLayersObjectIndexOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RenderLayersReflectionOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RenderLayersRefractionOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RenderLayersShadowOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RenderLayersSpecularOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RenderLayersSpeedOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RenderLayersUVOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RotateOperation.cpp
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_SeparateChannelOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SetAlphaOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SetColorOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SetSamplerOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SetValueOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SetVectorOperation.cpp
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_SplitViewerOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_TextureOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_TonemapOperation.cpp
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_VectorCurveOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ViewerOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ZCombineOperation.cpp
branches/soc-2012-bratwurst/source/blender/editors/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/editors/SConscript
branches/soc-2012-bratwurst/source/blender/editors/animation/anim_filter.c
branches/soc-2012-bratwurst/source/blender/editors/animation/keyframes_general.c
branches/soc-2012-bratwurst/source/blender/editors/animation/keyframing.c
branches/soc-2012-bratwurst/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2012-bratwurst/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2012-bratwurst/source/blender/editors/include/ED_clip.h
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_draw.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_handlers.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_icons.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_ops.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_utils.c
branches/soc-2012-bratwurst/source/blender/editors/interface/resources.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_add.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_draw.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_edit.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_intern.h
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_ops.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_relationships.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_select.c
branches/soc-2012-bratwurst/source/blender/editors/mesh/editmesh_select.c
branches/soc-2012-bratwurst/source/blender/editors/object/object_add.c
branches/soc-2012-bratwurst/source/blender/editors/object/object_constraint.c
branches/soc-2012-bratwurst/source/blender/editors/object/object_edit.c
branches/soc-2012-bratwurst/source/blender/editors/object/object_lattice.c
branches/soc-2012-bratwurst/source/blender/editors/screen/screen_ops.c
branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/soc-2012-bratwurst/source/blender/editors/space_api/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/editors/space_api/SConscript
branches/soc-2012-bratwurst/source/blender/editors/space_api/spacetypes.c
branches/soc-2012-bratwurst/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_buttons.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_dopesheet_draw.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_dopesheet_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_draw.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_editor.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_graph_draw.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_graph_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_intern.h
branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_utils.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/space_clip.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_file/file_draw.c
branches/soc-2012-bratwurst/source/blender/editors/space_file/file_intern.h
branches/soc-2012-bratwurst/source/blender/editors/space_file/file_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_file/file_panels.c
branches/soc-2012-bratwurst/source/blender/editors/space_file/filelist.c
branches/soc-2012-bratwurst/source/blender/editors/space_file/filelist.h
branches/soc-2012-bratwurst/source/blender/editors/space_file/filesel.c
branches/soc-2012-bratwurst/source/blender/editors/space_file/fsmenu.c
branches/soc-2012-bratwurst/source/blender/editors/space_file/fsmenu.h
branches/soc-2012-bratwurst/source/blender/editors/space_file/space_file.c
branches/soc-2012-bratwurst/source/blender/editors/space_image/space_image.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/drawnode.c
branches/soc-2012-bratwurst/source/blender/editors/space_text/text_draw.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/drawobject.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2012-bratwurst/source/blender/editors/transform/transform.c
branches/soc-2012-bratwurst/source/blender/editors/transform/transform_conversions.c
branches/soc-2012-bratwurst/source/blender/editors/transform/transform_generics.c
branches/soc-2012-bratwurst/source/blender/editors/transform/transform_snap.c
branches/soc-2012-bratwurst/source/blender/gpu/intern/gpu_draw.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/anim_movie.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/indexer.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2012-bratwurst/source/blender/imbuf/intern/util.c
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_ID.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_action_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_anim_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_armature_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_boid_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_brush_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_color_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_curve_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_mask_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_node_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_object_force.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_object_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_packedFile_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_scene_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_screen_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_sound_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_space_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_tracking_types.h
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_movieclip.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_nodetree_types.h
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_screen.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_space.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2012-bratwurst/source/blender/nodes/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/nodes/NOD_composite.h
branches/soc-2012-bratwurst/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/node_composite_util.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/node_composite_util.h
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_bokehblur.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_dilate.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_glare.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_mask.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_movieclip.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_scale.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_tonemap.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_viewer.c
branches/soc-2012-bratwurst/source/blender/nodes/shader/nodes/node_shader_particle_info.c
branches/soc-2012-bratwurst/source/blender/nodes/texture/node_texture_util.c
branches/soc-2012-bratwurst/source/blender/nodes/texture/nodes/node_texture_coord.c
branches/soc-2012-bratwurst/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
branches/soc-2012-bratwurst/source/blender/nodes/texture/nodes/node_texture_texture.c
branches/soc-2012-bratwurst/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/external_engine.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/initrender.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/pixelblending.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/volumetric.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/zbuf.c
branches/soc-2012-bratwurst/source/blender/windowmanager/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_subwindow.c
branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_window.c
branches/soc-2012-bratwurst/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2012-bratwurst/source/creator/CMakeLists.txt
branches/soc-2012-bratwurst/source/creator/creator.c
branches/soc-2012-bratwurst/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
branches/soc-2012-bratwurst/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2012-bratwurst/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2012-bratwurst/source/gameengine/Expressions/PyObjectPlus.h
branches/soc-2012-bratwurst/source/gameengine/GameLogic/SCA_ILogicBrick.h
branches/soc-2012-bratwurst/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
branches/soc-2012-bratwurst/source/gameengine/GameLogic/SCA_RandomActuator.cpp
branches/soc-2012-bratwurst/source/gameengine/Ketsji/BL_Shader.cpp
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_BulletPhysicsController.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_Dome.cpp
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_PyMath.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_RadarSensor.cpp
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_RadarSensor.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
branches/soc-2012-bratwurst/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/soc-2012-bratwurst/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/soc-2012-bratwurst/source/gameengine/Rasterizer/RAS_2DFilterManager.h
branches/soc-2012-bratwurst/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/soc-2012-bratwurst/source/gameengine/VideoTexture/Exception.cpp
branches/soc-2012-bratwurst/source/gameengine/VideoTexture/FilterBase.cpp
branches/soc-2012-bratwurst/source/gameengine/VideoTexture/FilterBase.h
branches/soc-2012-bratwurst/source/gameengine/VideoTexture/FilterBlueScreen.cpp
branches/soc-2012-bratwurst/source/gameengine/VideoTexture/FilterColor.cpp
branches/soc-2012-bratwurst/source/gameengine/VideoTexture/FilterNormal.cpp
branches/soc-2012-bratwurst/source/gameengine/VideoTexture/FilterSource.cpp
branches/soc-2012-bratwurst/source/gameengine/VideoTexture/ImageBase.cpp
branches/soc-2012-bratwurst/source/gameengine/VideoTexture/ImageBase.h
branches/soc-2012-bratwurst/source/gameengine/VideoTexture/ImageBuff.cpp
branches/soc-2012-bratwurst/source/gameengine/VideoTexture/ImageMix.cpp
branches/soc-2012-bratwurst/source/gameengine/VideoTexture/ImageRender.cpp
branches/soc-2012-bratwurst/source/gameengine/VideoTexture/ImageRender.h
branches/soc-2012-bratwurst/source/gameengine/VideoTexture/ImageViewport.cpp
branches/soc-2012-bratwurst/source/gameengine/VideoTexture/PyTypeList.cpp
branches/soc-2012-bratwurst/source/gameengine/VideoTexture/PyTypeList.h
branches/soc-2012-bratwurst/source/gameengine/VideoTexture/Texture.cpp
branches/soc-2012-bratwurst/source/gameengine/VideoTexture/Texture.h
branches/soc-2012-bratwurst/source/gameengine/VideoTexture/VideoBase.h
branches/soc-2012-bratwurst/source/gameengine/VideoTexture/VideoFFmpeg.cpp
branches/soc-2012-bratwurst/source/gameengine/VideoTexture/VideoFFmpeg.h
branches/soc-2012-bratwurst/source/gameengine/VideoTexture/blendVideoTex.cpp
Added Paths:
-----------
branches/soc-2012-bratwurst/source/blender/blenlib/BLI_voronoi.h
branches/soc-2012-bratwurst/source/blender/blenlib/intern/voronoi.c
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_KeyingNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_KeyingNode.h
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_KeyingScreenNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_KeyingScreenNode.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_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/editors/io/
branches/soc-2012-bratwurst/source/blender/editors/io/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/editors/io/SConscript
branches/soc-2012-bratwurst/source/blender/editors/io/io_collada.c
branches/soc-2012-bratwurst/source/blender/editors/io/io_collada.h
branches/soc-2012-bratwurst/source/blender/editors/io/io_ops.c
branches/soc-2012-bratwurst/source/blender/editors/io/io_ops.h
branches/soc-2012-bratwurst/source/blender/editors/space_clip/tracking_select.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_keying.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_keyingscreen.c
Removed Paths:
-------------
branches/soc-2012-bratwurst/source/blender/editors/io/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/editors/io/SConscript
branches/soc-2012-bratwurst/source/blender/editors/io/io_collada.c
branches/soc-2012-bratwurst/source/blender/editors/io/io_collada.h
branches/soc-2012-bratwurst/source/blender/editors/io/io_ops.c
branches/soc-2012-bratwurst/source/blender/editors/io/io_ops.h
Property Changed:
----------------
branches/soc-2012-bratwurst/
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/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
/trunk/blender:46808-47866
+ /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
/trunk/blender:46808-48082
Modified: branches/soc-2012-bratwurst/doc/python_api/examples/bpy.types.Object.py
===================================================================
--- branches/soc-2012-bratwurst/doc/python_api/examples/bpy.types.Object.py 2012-06-19 14:26:29 UTC (rev 48082)
+++ branches/soc-2012-bratwurst/doc/python_api/examples/bpy.types.Object.py 2012-06-19 15:01:28 UTC (rev 48083)
@@ -2,7 +2,7 @@
Basic Object Operations Example
+++++++++++++++++++++++++++++++
This script demonstrates basic operations on object like creating new
-object, placing it into scene, selecting it and making it active
+object, placing it into scene, selecting it and making it active.
"""
import bpy
@@ -11,15 +11,15 @@
scene = bpy.context.scene
# Create new lamp datablock
-lamp_data = bpy.data.lamps.new(name="New Lamp", type="POINT")
+lamp_data = bpy.data.lamps.new(name="New Lamp", type='POINT')
-# Create new object with out lamp datablock
+# Create new object with our lamp datablock
lamp_object = bpy.data.objects.new(name="New Lamp", object_data=lamp_data)
# Link lamp object to the scene so it'll appear in this scene
scene.objects.link(lamp_object)
-# Place lamp to specified location
+# Place lamp to a specified location
lamp_object.location = (5.0, 5.0, 5.0)
# And finally select it make active
Modified: branches/soc-2012-bratwurst/doc/python_api/examples/bpy.types.Panel.1.py
===================================================================
--- branches/soc-2012-bratwurst/doc/python_api/examples/bpy.types.Panel.1.py 2012-06-19 14:26:29 UTC (rev 48082)
+++ branches/soc-2012-bratwurst/doc/python_api/examples/bpy.types.Panel.1.py 2012-06-19 15:01:28 UTC (rev 48083)
@@ -2,7 +2,7 @@
Simple Object Panel
+++++++++++++++++++
This panel has a :class:`Panel.poll` and :class:`Panel.draw_header` function,
-even though the contents is basic this closely resemples blenders panels.
+even though the contents is basic this closely resembles blenders panels.
"""
import bpy
Modified: branches/soc-2012-bratwurst/doc/python_api/rst/bge.types.rst
===================================================================
--- branches/soc-2012-bratwurst/doc/python_api/rst/bge.types.rst 2012-06-19 14:26:29 UTC (rev 48082)
+++ branches/soc-2012-bratwurst/doc/python_api/rst/bge.types.rst 2012-06-19 15:01:28 UTC (rev 48083)
@@ -2692,7 +2692,7 @@
The angle of the cone (in degrees) with which to test.
- :type: float from 0 to 360
+ :type: float
.. attribute:: axis
@@ -2703,11 +2703,6 @@
KX_RADAR_AXIS_POS_X, KX_RADAR_AXIS_POS_Y, KX_RADAR_AXIS_POS_Z,
KX_RADAR_AXIS_NEG_X, KX_RADAR_AXIS_NEG_Y, KX_RADAR_AXIS_NEG_Z
- .. method:: getConeHeight()
-
- :return: The height of the cone with which to test.
- :rtype: float
-
.. class:: KX_RaySensor(SCA_ISensor)
A ray sensor detects the first object in a given direction.
Modified: branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/CMakeLists.txt
===================================================================
--- branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/CMakeLists.txt 2012-06-19 14:26:29 UTC (rev 48082)
+++ branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/CMakeLists.txt 2012-06-19 15:01:28 UTC (rev 48083)
@@ -58,21 +58,6 @@
internal/ceres/detect_structure.cc
internal/ceres/evaluator.cc
internal/ceres/file.cc
- internal/ceres/generated/schur_eliminator_2_2_2.cc
- internal/ceres/generated/schur_eliminator_2_2_3.cc
- internal/ceres/generated/schur_eliminator_2_2_4.cc
- internal/ceres/generated/schur_eliminator_2_2_d.cc
- internal/ceres/generated/schur_eliminator_2_3_3.cc
- internal/ceres/generated/schur_eliminator_2_3_4.cc
- internal/ceres/generated/schur_eliminator_2_3_9.cc
- internal/ceres/generated/schur_eliminator_2_3_d.cc
- internal/ceres/generated/schur_eliminator_2_4_3.cc
- internal/ceres/generated/schur_eliminator_2_4_4.cc
- internal/ceres/generated/schur_eliminator_2_4_d.cc
- internal/ceres/generated/schur_eliminator_4_4_2.cc
- internal/ceres/generated/schur_eliminator_4_4_3.cc
- internal/ceres/generated/schur_eliminator_4_4_4.cc
- internal/ceres/generated/schur_eliminator_4_4_d.cc
internal/ceres/generated/schur_eliminator_d_d_d.cc
internal/ceres/gradient_checking_cost_function.cc
internal/ceres/implicit_schur_complement.cc
@@ -191,6 +176,26 @@
internal/ceres/visibility.h
)
+#if(FALSE)
+# list(APPEND SRC
+# internal/ceres/generated/schur_eliminator_2_2_2.cc
+# internal/ceres/generated/schur_eliminator_2_2_3.cc
+# internal/ceres/generated/schur_eliminator_2_2_4.cc
+# internal/ceres/generated/schur_eliminator_2_2_d.cc
+# internal/ceres/generated/schur_eliminator_2_3_3.cc
+# internal/ceres/generated/schur_eliminator_2_3_4.cc
+# internal/ceres/generated/schur_eliminator_2_3_9.cc
+# internal/ceres/generated/schur_eliminator_2_3_d.cc
+# internal/ceres/generated/schur_eliminator_2_4_3.cc
+# internal/ceres/generated/schur_eliminator_2_4_4.cc
+# internal/ceres/generated/schur_eliminator_2_4_d.cc
+# internal/ceres/generated/schur_eliminator_4_4_2.cc
+# internal/ceres/generated/schur_eliminator_4_4_3.cc
+# internal/ceres/generated/schur_eliminator_4_4_4.cc
+# internal/ceres/generated/schur_eliminator_4_4_d.cc
+# )
+#endif()
+
if(WIN32)
list(APPEND INC
../glog/src/windows
@@ -213,6 +218,7 @@
-D"CERES_HASH_NAMESPACE_END=}}"
-DCERES_NO_SUITESPARSE
-DCERES_DONT_HAVE_PROTOCOL_BUFFERS
+ -DCERES_RESTRICT_SCHUR_SPECIALIZATION
)
blender_add_lib(extern_ceres "${SRC}" "${INC}" "${INC_SYS}")
Modified: branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/SConscript
===================================================================
--- branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/SConscript 2012-06-19 14:26:29 UTC (rev 48082)
+++ branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/SConscript 2012-06-19 15:01:28 UTC (rev 48083)
@@ -13,13 +13,15 @@
defs = []
src += env.Glob('internal/ceres/*.cc')
-src += env.Glob('internal/ceres/generated/*.cc')
+src += env.Glob('internal/ceres/generated/schur_eliminator_d_d_d.cc')
+#src += env.Glob('internal/ceres/generated/*.cc')
defs.append('CERES_HAVE_PTHREAD')
defs.append('CERES_HASH_NAMESPACE_START=namespace std { namespace tr1 {')
defs.append('CERES_HASH_NAMESPACE_END=}}')
defs.append('CERES_NO_SUITESPARSE')
defs.append('CERES_DONT_HAVE_PROTOCOL_BUFFERS')
+defs.append('CERES_RESTRICT_SCHUR_SPECIALIZATION')
incs = '. ../../ ../../../Eigen3 ./include ./internal ../gflags'
Modified: branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/bundle.sh
===================================================================
--- branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/bundle.sh 2012-06-19 14:26:29 UTC (rev 48082)
+++ branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/bundle.sh 2012-06-19 15:01:28 UTC (rev 48083)
@@ -1,5 +1,6 @@
#!/bin/sh
+if false; then
if [ "x$1" = "x--i-really-know-what-im-doing" ] ; then
echo Proceeding as requested by command line ...
else
@@ -36,7 +37,10 @@
rm -rf $tmp
-sources=`find ./include ./internal -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | sed -r 's/^\.\//\t/' | sort -d`
+fi
+
+sources=`find ./include ./internal -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | sed -r 's/^\.\//\t/' | grep -v -E 'schur_eliminator_[0-9]_[0-9]_[0-9d].cc' | sort -d`
+generated_sources=`find ./include ./internal -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | sed -r 's/^\.\//#\t\t/' | grep -E 'schur_eliminator_[0-9]_[0-9]_[0-9d].cc' | sort -d`
headers=`find ./include ./internal -type f -iname '*.h' | sed -r 's/^\.\//\t/' | sort -d`
src_dir=`find ./internal -type f -iname '*.cc' -exec dirname {} \; -or -iname '*.cpp' -exec dirname {} \; -or -iname '*.c' -exec dirname {} \; | sed -r 's/^\.\//\t/' | sort -d | uniq`
@@ -48,6 +52,10 @@
continue;
fi
+ if test `echo "$x" | grep -c generated` -eq 1; then
+ continue;
+ fi
+
if stat $x/*.cpp > /dev/null 2>&1; then
t="src += env.Glob('`echo $x'/*.cpp'`')"
fi
@@ -121,6 +129,12 @@
${headers}
)
+#if(FALSE)
+# list(APPEND SRC
+${generated_sources}
+# )
+#endif()
+
if(WIN32)
list(APPEND INC
../glog/src/windows
@@ -143,6 +157,7 @@
-D"CERES_HASH_NAMESPACE_END=}}"
-DCERES_NO_SUITESPARSE
-DCERES_DONT_HAVE_PROTOCOL_BUFFERS
+ -DCERES_RESTRICT_SCHUR_SPECIALIZATION
)
blender_add_lib(extern_ceres "\${SRC}" "\${INC}" "\${INC_SYS}")
@@ -164,12 +179,15 @@
defs = []
$src
+src += env.Glob('internal/ceres/generated/schur_eliminator_d_d_d.cc')
+#src += env.Glob('internal/ceres/generated/*.cc')
defs.append('CERES_HAVE_PTHREAD')
defs.append('CERES_HASH_NAMESPACE_START=namespace std { namespace tr1 {')
defs.append('CERES_HASH_NAMESPACE_END=}}')
defs.append('CERES_NO_SUITESPARSE')
defs.append('CERES_DONT_HAVE_PROTOCOL_BUFFERS')
+defs.append('CERES_RESTRICT_SCHUR_SPECIALIZATION')
incs = '. ../../ ../../../Eigen3 ./include ./internal ../gflags'
Modified: branches/soc-2012-bratwurst/extern/recastnavigation/Recast/Include/RecastAssert.h
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list