[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49040] branches/soc-2012-bratwurst: merge with trunk 49039

Antony Riakiotakis kalast at gmail.com
Wed Jul 18 20:53:04 CEST 2012


Revision: 49040
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49040
Author:   psy-fi
Date:     2012-07-18 18:53:03 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
merge with trunk 49039

Modified Paths:
--------------
    branches/soc-2012-bratwurst/build_files/cmake/config/blender_lite.cmake
    branches/soc-2012-bratwurst/build_files/cmake/macros.cmake
    branches/soc-2012-bratwurst/intern/bsp/intern/BSP_CSGMesh.cpp
    branches/soc-2012-bratwurst/intern/cycles/kernel/kernel_differential.h
    branches/soc-2012-bratwurst/intern/cycles/util/util_cache.cpp
    branches/soc-2012-bratwurst/intern/cycles/util/util_path.cpp
    branches/soc-2012-bratwurst/intern/dualcon/intern/octree.cpp
    branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_SystemX11.h
    branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_WindowX11.h
    branches/soc-2012-bratwurst/intern/guardedalloc/MEM_guardedalloc.h
    branches/soc-2012-bratwurst/intern/guardedalloc/intern/mallocn.c
    branches/soc-2012-bratwurst/intern/itasc/Scene.cpp
    branches/soc-2012-bratwurst/intern/raskter/raskter.c
    branches/soc-2012-bratwurst/intern/smoke/intern/FLUID_3D.h
    branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/merge_po.py
    branches/soc-2012-bratwurst/release/scripts/modules/bpy/path.py
    branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_clip.py
    branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_info.py
    branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2012-bratwurst/release/text/readme.html
    branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_cdderivedmesh.h
    branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_mask.h
    branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_mesh.h
    branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_object.h
    branches/soc-2012-bratwurst/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/colortools.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/curve.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/displist.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/fmodifier.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/group.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/implicit.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/mask.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/mball.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/mesh.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/multires.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/object.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/particle.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/scene.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/seqeffects.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/softbody.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/writeframeserver.c
    branches/soc-2012-bratwurst/source/blender/blenlib/BLI_kdopbvh.h
    branches/soc-2012-bratwurst/source/blender/blenlib/BLI_math_geom.h
    branches/soc-2012-bratwurst/source/blender/blenlib/BLI_memarena.h
    branches/soc-2012-bratwurst/source/blender/blenlib/BLI_mempool.h
    branches/soc-2012-bratwurst/source/blender/blenlib/BLI_rect.h
    branches/soc-2012-bratwurst/source/blender/blenlib/BLI_scanfill.h
    branches/soc-2012-bratwurst/source/blender/blenlib/BLI_threads.h
    branches/soc-2012-bratwurst/source/blender/blenlib/BLI_utildefines.h
    branches/soc-2012-bratwurst/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/soc-2012-bratwurst/source/blender/blenlib/intern/DLRB_tree.c
    branches/soc-2012-bratwurst/source/blender/blenlib/intern/math_geom.c
    branches/soc-2012-bratwurst/source/blender/blenlib/intern/math_matrix.c
    branches/soc-2012-bratwurst/source/blender/blenlib/intern/math_vector_inline.c
    branches/soc-2012-bratwurst/source/blender/blenlib/intern/noise.c
    branches/soc-2012-bratwurst/source/blender/blenlib/intern/path_util.c
    branches/soc-2012-bratwurst/source/blender/blenlib/intern/rct.c
    branches/soc-2012-bratwurst/source/blender/blenlib/intern/threads.c
    branches/soc-2012-bratwurst/source/blender/blenlib/intern/voronoi.c
    branches/soc-2012-bratwurst/source/blender/blenloader/intern/readfile.c
    branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_core.c
    branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_marking.c
    branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_operator_api.h
    branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_polygon.c
    branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_queries.c
    branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_structure.h
    branches/soc-2012-bratwurst/source/blender/bmesh/operators/bmo_bevel.c
    branches/soc-2012-bratwurst/source/blender/bmesh/operators/bmo_dissolve.c
    branches/soc-2012-bratwurst/source/blender/bmesh/operators/bmo_hull.c
    branches/soc-2012-bratwurst/source/blender/bmesh/operators/bmo_inset.c
    branches/soc-2012-bratwurst/source/blender/bmesh/operators/bmo_utils.c
    branches/soc-2012-bratwurst/source/blender/bmesh/tools/BME_bevel.c
    branches/soc-2012-bratwurst/source/blender/compositor/COM_compositor.h
    branches/soc-2012-bratwurst/source/blender/compositor/SConscript
    branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_CPUDevice.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_ExecutionGroup.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_ExecutionGroup.h
    branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_ExecutionSystem.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_ExecutionSystem.h
    branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_MemoryBuffer.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_MemoryBuffer.h
    branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_MemoryProxy.h
    branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_Node.h
    branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_NodeOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_NodeOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_OpenCLDevice.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_OpenCLDevice.h
    branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_SocketReader.h
    branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_WorkScheduler.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_DefocusNode.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_AntiAliasOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_AntiAliasOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BilateralBlurOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_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_BokehBlurOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BokehImageOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BokehImageOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BoxMaskOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BoxMaskOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BrightnessOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BrightnessOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_CalculateMeanOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_CalculateMeanOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ChangeHSVOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ChangeHSVOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ChannelMatteOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ChannelMatteOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ChromaMatteOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ChromaMatteOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorCorrectionOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorCurveOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorCurveOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorMatteOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorMatteOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorRampOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorRampOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorSpillOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorSpillOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_CombineChannelsOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_CompositorOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_CompositorOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertColorProfileOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertColorToValueProg.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertColorToValueProg.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertValueToColorProg.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertValueToColorProg.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_CropOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_CropOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DifferenceMatteOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DilateErodeOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DisplaceOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DisplaceOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DisplaceSimpleOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DistanceMatteOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DistanceMatteOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DotproductOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DotproductOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_EllipseMaskOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_FlipOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_FlipOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GammaCorrectOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GammaCorrectOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GammaOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GammaOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianXBlurOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianYBlurOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GlareBaseOperation.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_GlareThresholdOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GlareThresholdOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_IDMaskOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_IDMaskOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ImageOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ImageOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_InvertOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_InvertOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_KeyingBlurOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_KeyingBlurOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_KeyingClipOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_KeyingClipOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_KeyingDespillOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_KeyingDespillOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_KeyingOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_KeyingOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_KeyingScreenOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_LuminanceMatteOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MapUVOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MapUVOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MapValueOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MapValueOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MaskOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MaskOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MathBaseOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MathBaseOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixAddOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixAddOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixBaseOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixBaseOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixBlendOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixBlendOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixBurnOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixBurnOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixColorOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixColorOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixDarkenOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixDifferenceOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixDivideOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixDivideOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixDodgeOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixDodgeOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixGlareOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixGlareOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixHueOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixHueOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixLightenOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixLightenOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixLinearLightOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixMultiplyOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixMultiplyOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixOverlayOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixSaturationOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixScreenOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixScreenOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixSoftLightOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixSubtractOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixValueOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixValueOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MovieClipOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MovieClipOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MovieDistortionOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MultilayerImageOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_NormalizeOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_NormalizeOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_OpenCLKernels.cl
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_OpenCLKernels.cl.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_OutputFileOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_OutputFileOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_PreviewOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_PreviewOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ReadBufferOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ReadBufferOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RenderLayersAlphaProg.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RenderLayersAlphaProg.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RenderLayersBaseProg.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RotateOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RotateOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ScaleOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ScaleOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SeparateChannelOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SeparateChannelOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SetAlphaOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SetAlphaOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SetColorOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SetColorOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SetSamplerOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SetSamplerOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SetValueOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SetValueOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SetVectorOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SetVectorOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SocketProxyOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SocketProxyOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SplitViewerOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_TextureOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_TextureOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_TonemapOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_TonemapOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_TranslateOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_TranslateOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_VectorBlurOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_VectorCurveOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_VectorCurveOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ViewerOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ViewerOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_WriteBufferOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ZCombineOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ZCombineOperation.h
    branches/soc-2012-bratwurst/source/blender/editors/animation/anim_channels_defines.c
    branches/soc-2012-bratwurst/source/blender/editors/animation/anim_intern.h
    branches/soc-2012-bratwurst/source/blender/editors/animation/anim_markers.c
    branches/soc-2012-bratwurst/source/blender/editors/animation/anim_ops.c
    branches/soc-2012-bratwurst/source/blender/editors/animation/keyframes_edit.c
    branches/soc-2012-bratwurst/source/blender/editors/animation/keyframing.c
    branches/soc-2012-bratwurst/source/blender/editors/gpencil/drawgpencil.c
    branches/soc-2012-bratwurst/source/blender/editors/include/ED_numinput.h
    branches/soc-2012-bratwurst/source/blender/editors/include/ED_object.h
    branches/soc-2012-bratwurst/source/blender/editors/include/UI_interface.h
    branches/soc-2012-bratwurst/source/blender/editors/include/UI_view2d.h
    branches/soc-2012-bratwurst/source/blender/editors/interface/interface.c
    branches/soc-2012-bratwurst/source/blender/editors/interface/interface_anim.c
    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_intern.h
    branches/soc-2012-bratwurst/source/blender/editors/interface/interface_panel.c
    branches/soc-2012-bratwurst/source/blender/editors/interface/interface_templates.c
    branches/soc-2012-bratwurst/source/blender/editors/interface/view2d.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_select.c
    branches/soc-2012-bratwurst/source/blender/editors/mesh/editmesh_loopcut.c
    branches/soc-2012-bratwurst/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2012-bratwurst/source/blender/editors/object/object_group.c
    branches/soc-2012-bratwurst/source/blender/editors/object/object_relations.c
    branches/soc-2012-bratwurst/source/blender/editors/physics/physics_fluid.c
    branches/soc-2012-bratwurst/source/blender/editors/screen/area.c
    branches/soc-2012-bratwurst/source/blender/editors/screen/screen_edit.c
    branches/soc-2012-bratwurst/source/blender/editors/screen/screen_intern.h
    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/paint_ops.c
    branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_utils.c
    branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_ops.c
    branches/soc-2012-bratwurst/source/blender/editors/space_clip/space_clip.c
    branches/soc-2012-bratwurst/source/blender/editors/space_clip/tracking_select.c
    branches/soc-2012-bratwurst/source/blender/editors/space_file/file_ops.c
    branches/soc-2012-bratwurst/source/blender/editors/space_image/image_buttons.c
    branches/soc-2012-bratwurst/source/blender/editors/space_image/image_draw.c
    branches/soc-2012-bratwurst/source/blender/editors/space_node/CMakeLists.txt
    branches/soc-2012-bratwurst/source/blender/editors/space_node/SConscript
    branches/soc-2012-bratwurst/source/blender/editors/space_node/drawnode.c
    branches/soc-2012-bratwurst/source/blender/editors/space_node/node_draw.c
    branches/soc-2012-bratwurst/source/blender/editors/space_node/node_edit.c
    branches/soc-2012-bratwurst/source/blender/editors/space_node/node_select.c
    branches/soc-2012-bratwurst/source/blender/editors/space_node/node_state.c
    branches/soc-2012-bratwurst/source/blender/editors/space_outliner/outliner_edit.c
    branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/sequencer_select.c
    branches/soc-2012-bratwurst/source/blender/editors/space_text/text_ops.c
    branches/soc-2012-bratwurst/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2012-bratwurst/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2012-bratwurst/source/blender/editors/transform/transform.c
    branches/soc-2012-bratwurst/source/blender/editors/util/numinput.c
    branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2012-bratwurst/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2012-bratwurst/source/blender/ikplugin/intern/itasc_plugin.cpp
    branches/soc-2012-bratwurst/source/blender/imbuf/IMB_moviecache.h
    branches/soc-2012-bratwurst/source/blender/imbuf/intern/imageprocess.c
    branches/soc-2012-bratwurst/source/blender/imbuf/intern/jp2.c
    branches/soc-2012-bratwurst/source/blender/imbuf/intern/jpeg.c
    branches/soc-2012-bratwurst/source/blender/imbuf/intern/scaling.c
    branches/soc-2012-bratwurst/source/blender/makesdna/DNA_anim_types.h
    branches/soc-2012-bratwurst/source/blender/makesdna/DNA_mask_types.h
    branches/soc-2012-bratwurst/source/blender/makesdna/DNA_texture_types.h
    branches/soc-2012-bratwurst/source/blender/makesdna/intern/dna_genfile.c
    branches/soc-2012-bratwurst/source/blender/makesrna/RNA_enum_types.h
    branches/soc-2012-bratwurst/source/blender/makesrna/RNA_types.h
    branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_mask.c
    branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_object_api.c
    branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_scene_api.c
    branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_space.c
    branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2012-bratwurst/source/blender/modifiers/intern/MOD_array.c
    branches/soc-2012-bratwurst/source/blender/modifiers/intern/MOD_edgesplit.c
    branches/soc-2012-bratwurst/source/blender/modifiers/intern/MOD_particleinstance.c
    branches/soc-2012-bratwurst/source/blender/modifiers/intern/MOD_skin.c
    branches/soc-2012-bratwurst/source/blender/modifiers/intern/MOD_solidify.c
    branches/soc-2012-bratwurst/source/blender/modifiers/intern/MOD_weightvgproximity.c
    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/nodes/node_composite_doubleEdgeMask.c
    branches/soc-2012-bratwurst/source/blender/nodes/shader/node_shader_util.c
    branches/soc-2012-bratwurst/source/blender/python/bmesh/bmesh_py_types.c
    branches/soc-2012-bratwurst/source/blender/python/bmesh/bmesh_py_types_meshdata.c
    branches/soc-2012-bratwurst/source/blender/python/bmesh/bmesh_py_types_select.c
    branches/soc-2012-bratwurst/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2012-bratwurst/source/blender/python/generic/idprop_py_api.c
    branches/soc-2012-bratwurst/source/blender/python/generic/py_capi_utils.c
    branches/soc-2012-bratwurst/source/blender/python/intern/bpy_operator.c
    branches/soc-2012-bratwurst/source/blender/python/intern/bpy_props.c
    branches/soc-2012-bratwurst/source/blender/python/intern/bpy_rna.c
    branches/soc-2012-bratwurst/source/blender/python/intern/bpy_rna_array.c
    branches/soc-2012-bratwurst/source/blender/python/mathutils/mathutils_Color.c
    branches/soc-2012-bratwurst/source/blender/python/mathutils/mathutils_Matrix.c
    branches/soc-2012-bratwurst/source/blender/python/mathutils/mathutils_Vector.c
    branches/soc-2012-bratwurst/source/blender/python/mathutils/mathutils_noise.c
    branches/soc-2012-bratwurst/source/blender/quicktime/apple/qtkit_export.m
    branches/soc-2012-bratwurst/source/blender/quicktime/apple/qtkit_import.m
    branches/soc-2012-bratwurst/source/blender/quicktime/apple/quicktime_import.c
    branches/soc-2012-bratwurst/source/blender/render/intern/include/zbuf.h
    branches/soc-2012-bratwurst/source/blender/render/intern/raytrace/reorganize.h
    branches/soc-2012-bratwurst/source/blender/render/intern/source/convertblender.c
    branches/soc-2012-bratwurst/source/blender/render/intern/source/imagetexture.c
    branches/soc-2012-bratwurst/source/blender/render/intern/source/rayshade.c
    branches/soc-2012-bratwurst/source/blender/render/intern/source/render_texture.c
    branches/soc-2012-bratwurst/source/blender/render/intern/source/renderdatabase.c
    branches/soc-2012-bratwurst/source/blender/render/intern/source/shadbuf.c
    branches/soc-2012-bratwurst/source/blender/render/intern/source/sunsky.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/SConscript
    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_gesture.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/creator/CMakeLists.txt
    branches/soc-2012-bratwurst/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/soc-2012-bratwurst/source/gameengine/GameLogic/SCA_KeyboardSensor.h
    branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_BlenderMaterial.h
    branches/soc-2012-bratwurst/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp

Added Paths:
-----------
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/mask_rasterize.c

Property Changed:
----------------
    branches/soc-2012-bratwurst/
    branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_TrackPositionNode.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_TrackPositionNode.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_TrackPositionOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_TrackPositionOperation.h
    branches/soc-2012-bratwurst/source/blender/editors/interface/interface.c
    branches/soc-2012-bratwurst/source/blender/editors/space_outliner/
    branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_trackpos.c


Property changes on: branches/soc-2012-bratwurst
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793
/trunk/blender:46808-48817
   + /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
/trunk/blender:46808-49039

Modified: branches/soc-2012-bratwurst/build_files/cmake/config/blender_lite.cmake
===================================================================
--- branches/soc-2012-bratwurst/build_files/cmake/config/blender_lite.cmake	2012-07-18 17:33:40 UTC (rev 49039)
+++ branches/soc-2012-bratwurst/build_files/cmake/config/blender_lite.cmake	2012-07-18 18:53:03 UTC (rev 49040)
@@ -17,6 +17,7 @@
 set(WITH_LIBMV               OFF CACHE FORCE BOOL)
 set(WITH_CARVE               OFF CACHE FORCE BOOL)
 set(WITH_GAMEENGINE          OFF CACHE FORCE BOOL)
+set(WITH_COMPOSITOR          OFF CACHE FORCE BOOL)
 set(WITH_GHOST_XDND          OFF CACHE FORCE BOOL)
 set(WITH_IK_ITASC            OFF CACHE FORCE BOOL)
 set(WITH_IMAGE_CINEON        OFF CACHE FORCE BOOL)

Modified: branches/soc-2012-bratwurst/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2012-bratwurst/build_files/cmake/macros.cmake	2012-07-18 17:33:40 UTC (rev 49039)
+++ branches/soc-2012-bratwurst/build_files/cmake/macros.cmake	2012-07-18 18:53:03 UTC (rev 49040)
@@ -23,6 +23,25 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
+macro(list_insert_after
+	list_id item_check item_add
+	)
+	set(_index)
+	list(FIND ${list_id} "${item_check}" _index)
+	math(EXPR _index "${_index} + 1")
+	list(INSERT ${list_id} "${_index}" ${item_add})
+	unset(_index)
+endmacro()
+
+macro(list_insert_before
+	list_id item_check item_add
+	)
+	set(_index)
+	list(FIND ${list_id} "${item_check}" _index)
+	list(INSERT ${list_id} "${_index}" ${item_add})
+	unset(_index)
+endmacro()
+
 # foo_bar.spam --> foo_barMySuffix.spam
 macro(file_suffix
 	file_name_new file_name file_suffix

Modified: branches/soc-2012-bratwurst/intern/bsp/intern/BSP_CSGMesh.cpp
===================================================================
--- branches/soc-2012-bratwurst/intern/bsp/intern/BSP_CSGMesh.cpp	2012-07-18 17:33:40 UTC (rev 49039)
+++ branches/soc-2012-bratwurst/intern/bsp/intern/BSP_CSGMesh.cpp	2012-07-18 18:53:03 UTC (rev 49040)
@@ -486,7 +486,7 @@
 		BSP_MEdge &e = edges[*e_it]; 
 
 		// iterate through the faces of this edge - push unselected
-		// edges to ouput and then select the edge
+		// edges to output and then select the edge
 
 		vector<BSP_FaceInd>::const_iterator e_faces_end = e.m_faces.end();
 		vector<BSP_FaceInd>::iterator e_faces_it = e.m_faces.begin();

Modified: branches/soc-2012-bratwurst/intern/cycles/kernel/kernel_differential.h
===================================================================
--- branches/soc-2012-bratwurst/intern/cycles/kernel/kernel_differential.h	2012-07-18 17:33:40 UTC (rev 49039)
+++ branches/soc-2012-bratwurst/intern/cycles/kernel/kernel_differential.h	2012-07-18 18:53:03 UTC (rev 49040)
@@ -22,7 +22,7 @@
 
 __device void differential_transfer(differential3 *dP_, const differential3 dP, float3 D, const differential3 dD, float3 Ng, float t)
 {
-	/* ray differential transfer through homogenous medium, to
+	/* ray differential transfer through homogeneous medium, to
 	 * compute dPdx/dy at a shading point from the incoming ray */
 
 	float3 tmp = D/dot(D, Ng);

Modified: branches/soc-2012-bratwurst/intern/cycles/util/util_cache.cpp
===================================================================
--- branches/soc-2012-bratwurst/intern/cycles/util/util_cache.cpp	2012-07-18 17:33:40 UTC (rev 49039)
+++ branches/soc-2012-bratwurst/intern/cycles/util/util_cache.cpp	2012-07-18 18:53:03 UTC (rev 49040)
@@ -26,8 +26,6 @@
 #include "util_path.h"
 #include "util_types.h"
 
-#define BOOST_FILESYSTEM_VERSION 2
-
 #include <boost/filesystem.hpp> 
 #include <boost/algorithm/string.hpp>
 
@@ -117,7 +115,7 @@
 		boost::filesystem::directory_iterator it(dir), it_end;
 
 		for(; it != it_end; it++) {
-			string filename = it->path().filename();
+			string filename = it->path().filename().string();
 
 			if(boost::starts_with(filename, name))
 				if(except.find(filename) == except.end())

Modified: branches/soc-2012-bratwurst/intern/cycles/util/util_path.cpp
===================================================================
--- branches/soc-2012-bratwurst/intern/cycles/util/util_path.cpp	2012-07-18 17:33:40 UTC (rev 49039)
+++ branches/soc-2012-bratwurst/intern/cycles/util/util_path.cpp	2012-07-18 18:53:03 UTC (rev 49040)
@@ -26,8 +26,6 @@
 
 #include <stdio.h>
 
-#define BOOST_FILESYSTEM_VERSION 2
-
 #include <boost/filesystem.hpp> 
 #include <boost/algorithm/string.hpp>
 
@@ -60,7 +58,7 @@
 
 string path_filename(const string& path)
 {
-	return boost::filesystem::path(path).filename();
+	return boost::filesystem::path(path).filename().string();
 }
 
 string path_dirname(const string& path)

Modified: branches/soc-2012-bratwurst/intern/dualcon/intern/octree.cpp
===================================================================
--- branches/soc-2012-bratwurst/intern/dualcon/intern/octree.cpp	2012-07-18 17:33:40 UTC (rev 49039)
+++ branches/soc-2012-bratwurst/intern/dualcon/intern/octree.cpp	2012-07-18 18:53:03 UTC (rev 49040)
@@ -54,7 +54,7 @@
 	   After playing around with this option, the only case I could
 	   find where this option gives different results is on
 	   relatively thin corners. Sometimes along these corners two
-	   vertices from seperate sides will be placed in the same
+	   vertices from separate sides will be placed in the same
 	   position, so hole gets filled with a 5-sided face, where two
 	   of those vertices are in the same 3D location. If
 	   `use_manifold' is disabled, then the modifier doesn't

Modified: branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_SystemX11.cpp	2012-07-18 17:33:40 UTC (rev 49039)
+++ branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_SystemX11.cpp	2012-07-18 18:53:03 UTC (rev 49040)
@@ -93,9 +93,12 @@
 		abort(); //was return before, but this would just mean it will crash later
 	}
 
-	/* Open a connection to the X input manager */
 #if defined(WITH_X11_XINPUT) && defined(X_HAVE_UTF8_STRING)
-	m_xim = XOpenIM(m_display, NULL, (char *)GHOST_X11_RES_NAME, (char *)GHOST_X11_RES_CLASS);
+	/* note -- don't open connection to XIM server here, because the locale
+	 * has to be set before opening the connection but setlocale() has not
+	 * been called yet.  the connection will be opened after entering
+	 * the event loop. */
+	m_xim = NULL;
 #endif
 
 	m_delete_window_atom 
@@ -273,6 +276,35 @@
 	return window;
 }
 
+#if defined(WITH_X11_XINPUT) && defined(X_HAVE_UTF8_STRING)
+static void destroyIMCallback(XIM xim, XPointer ptr, XPointer data)
+{
+	GHOST_PRINT("XIM server died\n");
+
+	if (ptr)
+		*(XIM *)ptr = NULL;
+}
+
+bool GHOST_SystemX11::openX11_IM()
+{
+	if (!m_display)
+		return false;
+
+	/* set locale modifiers such as "@im=ibus" specified by XMODIFIERS */
+	XSetLocaleModifiers("");
+
+	m_xim = XOpenIM(m_display, NULL, (char *)GHOST_X11_RES_NAME, (char *)GHOST_X11_RES_CLASS);
+	if (!m_xim)
+		return false;
+
+	XIMCallback destroy;
+	destroy.callback = (XIMProc)destroyIMCallback;
+	destroy.client_data = (XPointer)&m_xim;
+	XSetIMValues(m_xim, XNDestroyCallback, &destroy, NULL);
+	return true;
+}
+#endif
+
 GHOST_WindowX11 *
 GHOST_SystemX11::
 findGhostWindow(
@@ -408,6 +440,38 @@
 		while (XPending(m_display)) {
 			XEvent xevent;
 			XNextEvent(m_display, &xevent);
+
+#if defined(WITH_X11_XINPUT) && defined(X_HAVE_UTF8_STRING)
+			/* open connection to XIM server and create input context (XIC)
+			 * when receiving the first FocusIn or KeyPress event after startup,
+			 * or recover XIM and XIC when the XIM server has been restarted */
+			if (xevent.type == FocusIn || xevent.type == KeyPress) {
+				if (!m_xim && openX11_IM()) {
+					GHOST_PRINT("Connected to XIM server\n");
+				}
+
+				if (m_xim) {
+					GHOST_WindowX11 * window = findGhostWindow(xevent.xany.window);
+					if (window && !window->getX11_XIC() && window->createX11_XIC()) {
+						GHOST_PRINT("XIM input context created\n");
+						if (xevent.type == KeyPress)
+							/* we can assume the window has input focus
+							 * here, because key events are received only
+							 * when the window is focused. */
+							XSetICFocus(window->getX11_XIC());
+					}
+				}
+			}
+
+			/* dispatch event to XIM server */
+			if ((XFilterEvent(&xevent, (Window)NULL) == True) && (xevent.type != KeyRelease)) {
+				/* do nothing now, the event is consumed by XIM.
+				 * however, KeyRelease event should be processed
+				 * here, otherwise modifiers remain activated.   */
+				continue;
+			}
+#endif
+
 			processEvent(&xevent);
 			anyProcessed = true;
 		}
@@ -535,7 +599,19 @@
 			XKeyEvent *xke = &(xe->xkey);
 			KeySym key_sym = XLookupKeysym(xke, 0);
 			char ascii;
-			char utf8_buf[6]; /* 6 is enough for a utf8 char */
+#if defined(WITH_X11_XINPUT) && defined(X_HAVE_UTF8_STRING)
+			/* utf8_array[] is initial buffer used for Xutf8LookupString().
+			 * if the length of the utf8 string exceeds this array, allocate

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list