[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50017] branches/soc-2012-sushi: svn merge ^/trunk/blender -r49508:50014
Campbell Barton
ideasman42 at gmail.com
Sun Aug 19 16:07:52 CEST 2012
Revision: 50017
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50017
Author: campbellbarton
Date: 2012-08-19 14:07:51 +0000 (Sun, 19 Aug 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r49508:50014
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49508
Modified Paths:
--------------
branches/soc-2012-sushi/CMakeLists.txt
branches/soc-2012-sushi/GNUmakefile
branches/soc-2012-sushi/SConstruct
branches/soc-2012-sushi/build_files/cmake/Modules/FindOpenCOLLADA.cmake
branches/soc-2012-sushi/build_files/cmake/cmake_netbeans_project.py
branches/soc-2012-sushi/build_files/cmake/config/blender_lite.cmake
branches/soc-2012-sushi/build_files/cmake/macros.cmake
branches/soc-2012-sushi/build_files/scons/config/linux-config.py
branches/soc-2012-sushi/build_files/scons/config/win32-vc-config.py
branches/soc-2012-sushi/build_files/scons/config/win64-vc-config.py
branches/soc-2012-sushi/build_files/scons/tools/Blender.py
branches/soc-2012-sushi/build_files/scons/tools/btools.py
branches/soc-2012-sushi/extern/eltopo/SConscript
branches/soc-2012-sushi/extern/eltopo/common/runstats.h
branches/soc-2012-sushi/intern/CMakeLists.txt
branches/soc-2012-sushi/intern/container/CTR_HashedPtr.h
branches/soc-2012-sushi/intern/cycles/app/cycles_test.cpp
branches/soc-2012-sushi/intern/cycles/blender/blender_object.cpp
branches/soc-2012-sushi/intern/cycles/blender/blender_particles.cpp
branches/soc-2012-sushi/intern/cycles/blender/blender_sync.h
branches/soc-2012-sushi/intern/ghost/GHOST_C-api.h
branches/soc-2012-sushi/intern/ghost/intern/GHOST_C-api.cpp
branches/soc-2012-sushi/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2012-sushi/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2012-sushi/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2012-sushi/intern/ghost/intern/GHOST_WindowWin32.h
branches/soc-2012-sushi/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2012-sushi/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2012-sushi/intern/guardedalloc/intern/mallocn.c
branches/soc-2012-sushi/intern/guardedalloc/test/simpletest/memtest.c
branches/soc-2012-sushi/intern/iksolver/CMakeLists.txt
branches/soc-2012-sushi/intern/iksolver/SConscript
branches/soc-2012-sushi/intern/smoke/intern/WAVELET_NOISE.h
branches/soc-2012-sushi/intern/string/STR_HashedString.h
branches/soc-2012-sushi/intern/string/STR_String.h
branches/soc-2012-sushi/release/datafiles/preview.blend
branches/soc-2012-sushi/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
branches/soc-2012-sushi/release/scripts/modules/bpy/path.py
branches/soc-2012-sushi/release/scripts/presets/interaction/blender.py
branches/soc-2012-sushi/release/scripts/presets/tracking_settings/blurry_footage.py
branches/soc-2012-sushi/release/scripts/presets/tracking_settings/default.py
branches/soc-2012-sushi/release/scripts/presets/tracking_settings/fast_motion.py
branches/soc-2012-sushi/release/scripts/startup/bl_operators/__init__.py
branches/soc-2012-sushi/release/scripts/startup/bl_operators/clip.py
branches/soc-2012-sushi/release/scripts/startup/bl_operators/presets.py
branches/soc-2012-sushi/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/properties_animviz.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/properties_data_curve.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/properties_mask_common.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/space_image.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/space_node.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2012-sushi/source/blender/CMakeLists.txt
branches/soc-2012-sushi/source/blender/avi/intern/avi.c
branches/soc-2012-sushi/source/blender/blenfont/BLF_api.h
branches/soc-2012-sushi/source/blender/blenfont/intern/blf.c
branches/soc-2012-sushi/source/blender/blenfont/intern/blf_font.c
branches/soc-2012-sushi/source/blender/blenfont/intern/blf_internal_types.h
branches/soc-2012-sushi/source/blender/blenkernel/BKE_blender.h
branches/soc-2012-sushi/source/blender/blenkernel/BKE_cloth.h
branches/soc-2012-sushi/source/blender/blenkernel/BKE_context.h
branches/soc-2012-sushi/source/blender/blenkernel/BKE_customdata.h
branches/soc-2012-sushi/source/blender/blenkernel/BKE_fcurve.h
branches/soc-2012-sushi/source/blender/blenkernel/BKE_font.h
branches/soc-2012-sushi/source/blender/blenkernel/BKE_global.h
branches/soc-2012-sushi/source/blender/blenkernel/BKE_mask.h
branches/soc-2012-sushi/source/blender/blenkernel/BKE_material.h
branches/soc-2012-sushi/source/blender/blenkernel/BKE_mball.h
branches/soc-2012-sushi/source/blender/blenkernel/BKE_node.h
branches/soc-2012-sushi/source/blender/blenkernel/BKE_object.h
branches/soc-2012-sushi/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2012-sushi/source/blender/blenkernel/SConscript
branches/soc-2012-sushi/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/CCGSubSurf.h
branches/soc-2012-sushi/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/anim.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/armature.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/blender.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/bmfont.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/boids.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/camera.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/cloth.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/constraint.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/curve.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/customdata.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/displist.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/fcurve.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/font.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/gpencil.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/group.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/idprop.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/image.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/image_gen.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/implicit.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/ipo.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/key.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/mask.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/mask_rasterize.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/material.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/mball.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/mesh.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/node.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/object.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/packedFile.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/particle.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/particle_system.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/pointcache.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/sca.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/scene.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/seqcache.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/sequencer.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/softbody.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/sound.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/tracking.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/unit.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/writeavi.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/writeframeserver.c
branches/soc-2012-sushi/source/blender/blenlib/BLI_array.h
branches/soc-2012-sushi/source/blender/blenlib/BLI_kdopbvh.h
branches/soc-2012-sushi/source/blender/blenlib/BLI_listbase.h
branches/soc-2012-sushi/source/blender/blenlib/BLI_rect.h
branches/soc-2012-sushi/source/blender/blenlib/BLI_utildefines.h
branches/soc-2012-sushi/source/blender/blenlib/CMakeLists.txt
branches/soc-2012-sushi/source/blender/blenlib/intern/bpath.c
branches/soc-2012-sushi/source/blender/blenlib/intern/freetypefont.c
branches/soc-2012-sushi/source/blender/blenlib/intern/listbase.c
branches/soc-2012-sushi/source/blender/blenlib/intern/math_geom.c
branches/soc-2012-sushi/source/blender/blenlib/intern/math_rotation.c
branches/soc-2012-sushi/source/blender/blenlib/intern/rct.c
branches/soc-2012-sushi/source/blender/blenlib/intern/scanfill.c
branches/soc-2012-sushi/source/blender/blenlib/intern/string_utf8.c
branches/soc-2012-sushi/source/blender/blenlib/intern/voronoi.c
branches/soc-2012-sushi/source/blender/blenloader/intern/readfile.c
branches/soc-2012-sushi/source/blender/blenloader/intern/readfile.h
branches/soc-2012-sushi/source/blender/blenloader/intern/undofile.c
branches/soc-2012-sushi/source/blender/blenloader/intern/versioning_250.c
branches/soc-2012-sushi/source/blender/blenloader/intern/writefile.c
branches/soc-2012-sushi/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2012-sushi/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2012-sushi/source/blender/bmesh/intern/bmesh_error.h
branches/soc-2012-sushi/source/blender/bmesh/intern/bmesh_interp.c
branches/soc-2012-sushi/source/blender/bmesh/intern/bmesh_marking.c
branches/soc-2012-sushi/source/blender/bmesh/intern/bmesh_mods.c
branches/soc-2012-sushi/source/blender/bmesh/intern/bmesh_operator_api.h
branches/soc-2012-sushi/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2012-sushi/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2012-sushi/source/blender/bmesh/intern/bmesh_structure.c
branches/soc-2012-sushi/source/blender/bmesh/operators/bmo_create.c
branches/soc-2012-sushi/source/blender/bmesh/operators/bmo_subdivide.c
branches/soc-2012-sushi/source/blender/bmesh/tools/BME_bevel.c
branches/soc-2012-sushi/source/blender/collada/AnimationExporter.cpp
branches/soc-2012-sushi/source/blender/collada/AnimationExporter.h
branches/soc-2012-sushi/source/blender/collada/AnimationImporter.cpp
branches/soc-2012-sushi/source/blender/collada/AnimationImporter.h
branches/soc-2012-sushi/source/blender/collada/ArmatureExporter.cpp
branches/soc-2012-sushi/source/blender/collada/CameraExporter.cpp
branches/soc-2012-sushi/source/blender/collada/DocumentImporter.cpp
branches/soc-2012-sushi/source/blender/collada/EffectExporter.cpp
branches/soc-2012-sushi/source/blender/collada/GeometryExporter.cpp
branches/soc-2012-sushi/source/blender/collada/ImageExporter.cpp
branches/soc-2012-sushi/source/blender/collada/InstanceWriter.cpp
branches/soc-2012-sushi/source/blender/collada/MaterialExporter.h
branches/soc-2012-sushi/source/blender/collada/MeshImporter.cpp
branches/soc-2012-sushi/source/blender/collada/MeshImporter.h
branches/soc-2012-sushi/source/blender/collada/collada_utils.cpp
branches/soc-2012-sushi/source/blender/collada/collada_utils.h
branches/soc-2012-sushi/source/blender/compositor/CMakeLists.txt
branches/soc-2012-sushi/source/blender/compositor/COM_compositor.h
branches/soc-2012-sushi/source/blender/compositor/COM_defines.h
branches/soc-2012-sushi/source/blender/compositor/SConscript
branches/soc-2012-sushi/source/blender/compositor/intern/COM_ChunkOrder.cpp
branches/soc-2012-sushi/source/blender/compositor/intern/COM_ChunkOrder.h
branches/soc-2012-sushi/source/blender/compositor/intern/COM_Converter.cpp
branches/soc-2012-sushi/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/soc-2012-sushi/source/blender/compositor/intern/COM_ExecutionGroup.h
branches/soc-2012-sushi/source/blender/compositor/intern/COM_ExecutionSystem.h
branches/soc-2012-sushi/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
branches/soc-2012-sushi/source/blender/compositor/intern/COM_InputSocket.cpp
branches/soc-2012-sushi/source/blender/compositor/intern/COM_InputSocket.h
branches/soc-2012-sushi/source/blender/compositor/intern/COM_MemoryBuffer.cpp
branches/soc-2012-sushi/source/blender/compositor/intern/COM_MemoryBuffer.h
branches/soc-2012-sushi/source/blender/compositor/intern/COM_NodeOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/intern/COM_NodeOperation.h
branches/soc-2012-sushi/source/blender/compositor/intern/COM_OpenCLDevice.cpp
branches/soc-2012-sushi/source/blender/compositor/intern/COM_OpenCLDevice.h
branches/soc-2012-sushi/source/blender/compositor/intern/COM_OutputSocket.cpp
branches/soc-2012-sushi/source/blender/compositor/intern/COM_OutputSocket.h
branches/soc-2012-sushi/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.h
branches/soc-2012-sushi/source/blender/compositor/intern/COM_Socket.h
branches/soc-2012-sushi/source/blender/compositor/intern/COM_SocketReader.h
branches/soc-2012-sushi/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/soc-2012-sushi/source/blender/compositor/intern/COM_compositor.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_BlurNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_DefocusNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_GroupNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_MuteNode.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_AntiAliasOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_AntiAliasOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_BilateralBlurOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_BokehBlurOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_BokehImageOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_BokehImageOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_BoxMaskOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_BoxMaskOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_BrightnessOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_BrightnessOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_CalculateMeanOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_CalculateMeanOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ChangeHSVOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ChangeHSVOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ChannelMatteOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ChannelMatteOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ChromaMatteOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ChromaMatteOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ColorCorrectionOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ColorCurveOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ColorCurveOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ColorMatteOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ColorMatteOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ColorRampOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ColorRampOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ColorSpillOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ColorSpillOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_CombineChannelsOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_CompositorOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_CompositorOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvertColorProfileOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvertColorToValueProg.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvertColorToValueProg.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvertValueToColorProg.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvertValueToColorProg.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_CropOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_CropOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_DifferenceMatteOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_DilateErodeOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_DisplaceOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_DisplaceOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_DisplaceSimpleOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_DotproductOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_DotproductOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_EllipseMaskOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_FlipOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_FlipOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_GammaCorrectOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_GammaCorrectOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_GammaOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_GammaOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_GaussianXBlurOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_GaussianYBlurOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_GlareThresholdOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_GlareThresholdOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_IDMaskOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_IDMaskOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ImageOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ImageOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_InvertOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_InvertOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_KeyingBlurOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_KeyingBlurOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_KeyingClipOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_KeyingClipOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_KeyingDespillOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_KeyingDespillOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_KeyingOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_KeyingOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_KeyingScreenOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_LuminanceMatteOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MapUVOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MapUVOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MapValueOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MapValueOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MaskOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MaskOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MathBaseOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MathBaseOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixAddOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixAddOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixBaseOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixBaseOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixBlendOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixBlendOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixBurnOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixBurnOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixColorOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixColorOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixDarkenOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixDifferenceOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixDivideOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixDivideOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixDodgeOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixDodgeOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixGlareOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixGlareOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixHueOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixHueOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixLightenOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixLightenOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixLinearLightOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixMultiplyOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixMultiplyOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixOverlayOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixSaturationOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixScreenOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixScreenOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixSoftLightOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixSubtractOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixValueOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MixValueOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MovieClipOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MovieClipOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MovieDistortionOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_MultilayerImageOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_NormalizeOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_NormalizeOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_OpenCLKernels.cl
branches/soc-2012-sushi/source/blender/compositor/operations/COM_PreviewOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_PreviewOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ReadBufferOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ReadBufferOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_RenderLayersAlphaProg.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_RenderLayersAlphaProg.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_RenderLayersBaseProg.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_RotateOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_RotateOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ScaleOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ScaleOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_SeparateChannelOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_SeparateChannelOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_SetAlphaOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_SetAlphaOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_SetColorOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_SetColorOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_SetSamplerOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_SetSamplerOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_SetValueOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_SetValueOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_SetVectorOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_SetVectorOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_SocketProxyOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_SocketProxyOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_TextureOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_TextureOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_TonemapOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_TonemapOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_TrackPositionOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_TrackPositionOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_TranslateOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_TranslateOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_VectorBlurOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_VectorCurveOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_VectorCurveOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_WriteBufferOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ZCombineOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ZCombineOperation.h
branches/soc-2012-sushi/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2012-sushi/source/blender/editors/animation/anim_deps.c
branches/soc-2012-sushi/source/blender/editors/animation/anim_draw.c
branches/soc-2012-sushi/source/blender/editors/animation/anim_filter.c
branches/soc-2012-sushi/source/blender/editors/animation/anim_markers.c
branches/soc-2012-sushi/source/blender/editors/animation/anim_ops.c
branches/soc-2012-sushi/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2012-sushi/source/blender/editors/armature/editarmature.c
branches/soc-2012-sushi/source/blender/editors/curve/editcurve.c
branches/soc-2012-sushi/source/blender/editors/curve/editfont.c
branches/soc-2012-sushi/source/blender/editors/datafiles/CMakeLists.txt
branches/soc-2012-sushi/source/blender/editors/datafiles/SConscript
branches/soc-2012-sushi/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2012-sushi/source/blender/editors/include/BIF_gl.h
branches/soc-2012-sushi/source/blender/editors/include/BIF_glutil.h
branches/soc-2012-sushi/source/blender/editors/include/ED_datafiles.h
branches/soc-2012-sushi/source/blender/editors/include/ED_image.h
branches/soc-2012-sushi/source/blender/editors/include/ED_node.h
branches/soc-2012-sushi/source/blender/editors/include/ED_object.h
branches/soc-2012-sushi/source/blender/editors/include/ED_screen_types.h
branches/soc-2012-sushi/source/blender/editors/include/ED_view3d.h
branches/soc-2012-sushi/source/blender/editors/include/UI_interface.h
branches/soc-2012-sushi/source/blender/editors/include/UI_view2d.h
branches/soc-2012-sushi/source/blender/editors/interface/interface.c
branches/soc-2012-sushi/source/blender/editors/interface/interface_anim.c
branches/soc-2012-sushi/source/blender/editors/interface/interface_draw.c
branches/soc-2012-sushi/source/blender/editors/interface/interface_handlers.c
branches/soc-2012-sushi/source/blender/editors/interface/interface_icons.c
branches/soc-2012-sushi/source/blender/editors/interface/interface_intern.h
branches/soc-2012-sushi/source/blender/editors/interface/interface_layout.c
branches/soc-2012-sushi/source/blender/editors/interface/interface_ops.c
branches/soc-2012-sushi/source/blender/editors/interface/interface_panel.c
branches/soc-2012-sushi/source/blender/editors/interface/interface_regions.c
branches/soc-2012-sushi/source/blender/editors/interface/interface_templates.c
branches/soc-2012-sushi/source/blender/editors/interface/interface_widgets.c
branches/soc-2012-sushi/source/blender/editors/interface/resources.c
branches/soc-2012-sushi/source/blender/editors/interface/view2d.c
branches/soc-2012-sushi/source/blender/editors/interface/view2d_ops.c
branches/soc-2012-sushi/source/blender/editors/io/io_collada.c
branches/soc-2012-sushi/source/blender/editors/mask/mask_add.c
branches/soc-2012-sushi/source/blender/editors/mask/mask_draw.c
branches/soc-2012-sushi/source/blender/editors/mask/mask_select.c
branches/soc-2012-sushi/source/blender/editors/mesh/editface.c
branches/soc-2012-sushi/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2012-sushi/source/blender/editors/mesh/editmesh_rip.c
branches/soc-2012-sushi/source/blender/editors/mesh/editmesh_select.c
branches/soc-2012-sushi/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2012-sushi/source/blender/editors/object/object_bake.c
branches/soc-2012-sushi/source/blender/editors/object/object_edit.c
branches/soc-2012-sushi/source/blender/editors/object/object_hook.c
branches/soc-2012-sushi/source/blender/editors/object/object_intern.h
branches/soc-2012-sushi/source/blender/editors/object/object_modifier.c
branches/soc-2012-sushi/source/blender/editors/object/object_relations.c
branches/soc-2012-sushi/source/blender/editors/object/object_select.c
branches/soc-2012-sushi/source/blender/editors/object/object_transform.c
branches/soc-2012-sushi/source/blender/editors/object/object_vgroup.c
branches/soc-2012-sushi/source/blender/editors/physics/dynamicpaint_ops.c
branches/soc-2012-sushi/source/blender/editors/physics/particle_edit.c
branches/soc-2012-sushi/source/blender/editors/physics/physics_fluid.c
branches/soc-2012-sushi/source/blender/editors/physics/physics_pointcache.c
branches/soc-2012-sushi/source/blender/editors/render/render_internal.c
branches/soc-2012-sushi/source/blender/editors/render/render_opengl.c
branches/soc-2012-sushi/source/blender/editors/render/render_preview.c
branches/soc-2012-sushi/source/blender/editors/render/render_shading.c
branches/soc-2012-sushi/source/blender/editors/render/render_view.c
branches/soc-2012-sushi/source/blender/editors/screen/area.c
branches/soc-2012-sushi/source/blender/editors/screen/glutil.c
branches/soc-2012-sushi/source/blender/editors/screen/screen_edit.c
branches/soc-2012-sushi/source/blender/editors/screen/screen_ops.c
branches/soc-2012-sushi/source/blender/editors/screen/screendump.c
branches/soc-2012-sushi/source/blender/editors/sculpt_paint/paint_hide.c
branches/soc-2012-sushi/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2012-sushi/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2012-sushi/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/soc-2012-sushi/source/blender/editors/sound/sound_ops.c
branches/soc-2012-sushi/source/blender/editors/space_action/action_select.c
branches/soc-2012-sushi/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2012-sushi/source/blender/editors/space_clip/clip_graph_ops.c
branches/soc-2012-sushi/source/blender/editors/space_clip/clip_intern.h
branches/soc-2012-sushi/source/blender/editors/space_clip/clip_ops.c
branches/soc-2012-sushi/source/blender/editors/space_clip/space_clip.c
branches/soc-2012-sushi/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2012-sushi/source/blender/editors/space_clip/tracking_select.c
branches/soc-2012-sushi/source/blender/editors/space_file/file_ops.c
branches/soc-2012-sushi/source/blender/editors/space_file/filelist.c
branches/soc-2012-sushi/source/blender/editors/space_file/space_file.c
branches/soc-2012-sushi/source/blender/editors/space_graph/graph_edit.c
branches/soc-2012-sushi/source/blender/editors/space_graph/graph_ops.c
branches/soc-2012-sushi/source/blender/editors/space_graph/graph_select.c
branches/soc-2012-sushi/source/blender/editors/space_graph/space_graph.c
branches/soc-2012-sushi/source/blender/editors/space_image/image_buttons.c
branches/soc-2012-sushi/source/blender/editors/space_image/image_edit.c
branches/soc-2012-sushi/source/blender/editors/space_image/image_ops.c
branches/soc-2012-sushi/source/blender/editors/space_image/space_image.c
branches/soc-2012-sushi/source/blender/editors/space_info/info_ops.c
branches/soc-2012-sushi/source/blender/editors/space_info/info_report.c
branches/soc-2012-sushi/source/blender/editors/space_logic/logic_buttons.c
branches/soc-2012-sushi/source/blender/editors/space_logic/logic_window.c
branches/soc-2012-sushi/source/blender/editors/space_nla/nla_channels.c
branches/soc-2012-sushi/source/blender/editors/space_nla/nla_select.c
branches/soc-2012-sushi/source/blender/editors/space_node/CMakeLists.txt
branches/soc-2012-sushi/source/blender/editors/space_node/drawnode.c
branches/soc-2012-sushi/source/blender/editors/space_node/node_add.c
branches/soc-2012-sushi/source/blender/editors/space_node/node_buttons.c
branches/soc-2012-sushi/source/blender/editors/space_node/node_draw.c
branches/soc-2012-sushi/source/blender/editors/space_node/node_edit.c
branches/soc-2012-sushi/source/blender/editors/space_node/node_group.c
branches/soc-2012-sushi/source/blender/editors/space_node/node_header.c
branches/soc-2012-sushi/source/blender/editors/space_node/node_intern.h
branches/soc-2012-sushi/source/blender/editors/space_node/node_ops.c
branches/soc-2012-sushi/source/blender/editors/space_node/node_relationships.c
branches/soc-2012-sushi/source/blender/editors/space_node/node_select.c
branches/soc-2012-sushi/source/blender/editors/space_node/node_templates.c
branches/soc-2012-sushi/source/blender/editors/space_node/space_node.c
branches/soc-2012-sushi/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2012-sushi/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2012-sushi/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2012-sushi/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2012-sushi/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2012-sushi/source/blender/editors/space_sequencer/sequencer_intern.h
branches/soc-2012-sushi/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2012-sushi/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2012-sushi/source/blender/editors/space_text/text_draw.c
branches/soc-2012-sushi/source/blender/editors/space_text/text_ops.c
branches/soc-2012-sushi/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2012-sushi/source/blender/editors/space_view3d/drawobject.c
branches/soc-2012-sushi/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2012-sushi/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2012-sushi/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2012-sushi/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2012-sushi/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2012-sushi/source/blender/editors/transform/transform.c
branches/soc-2012-sushi/source/blender/editors/transform/transform.h
branches/soc-2012-sushi/source/blender/editors/transform/transform_constraints.c
branches/soc-2012-sushi/source/blender/editors/transform/transform_conversions.c
branches/soc-2012-sushi/source/blender/editors/transform/transform_generics.c
branches/soc-2012-sushi/source/blender/editors/transform/transform_manipulator.c
branches/soc-2012-sushi/source/blender/editors/transform/transform_orientations.c
branches/soc-2012-sushi/source/blender/editors/transform/transform_snap.c
branches/soc-2012-sushi/source/blender/editors/util/undo.c
branches/soc-2012-sushi/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2012-sushi/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2012-sushi/source/blender/editors/uvedit/uvedit_parametrizer.h
branches/soc-2012-sushi/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2012-sushi/source/blender/gpu/CMakeLists.txt
branches/soc-2012-sushi/source/blender/gpu/SConscript
branches/soc-2012-sushi/source/blender/gpu/intern/gpu_draw.c
branches/soc-2012-sushi/source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_frag.glsl
branches/soc-2012-sushi/source/blender/ikplugin/CMakeLists.txt
branches/soc-2012-sushi/source/blender/ikplugin/intern/ikplugin_api.c
branches/soc-2012-sushi/source/blender/imbuf/IMB_imbuf.h
branches/soc-2012-sushi/source/blender/imbuf/IMB_imbuf_types.h
branches/soc-2012-sushi/source/blender/imbuf/IMB_moviecache.h
branches/soc-2012-sushi/source/blender/imbuf/intern/IMB_indexer.h
branches/soc-2012-sushi/source/blender/imbuf/intern/allocimbuf.c
branches/soc-2012-sushi/source/blender/imbuf/intern/anim_movie.c
branches/soc-2012-sushi/source/blender/imbuf/intern/bmp.c
branches/soc-2012-sushi/source/blender/imbuf/intern/divers.c
branches/soc-2012-sushi/source/blender/imbuf/intern/filter.c
branches/soc-2012-sushi/source/blender/imbuf/intern/imageprocess.c
branches/soc-2012-sushi/source/blender/imbuf/intern/indexer.c
branches/soc-2012-sushi/source/blender/imbuf/intern/iris.c
branches/soc-2012-sushi/source/blender/imbuf/intern/jp2.c
branches/soc-2012-sushi/source/blender/imbuf/intern/jpeg.c
branches/soc-2012-sushi/source/blender/imbuf/intern/metadata.c
branches/soc-2012-sushi/source/blender/imbuf/intern/moviecache.c
branches/soc-2012-sushi/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2012-sushi/source/blender/imbuf/intern/png.c
branches/soc-2012-sushi/source/blender/imbuf/intern/readimage.c
branches/soc-2012-sushi/source/blender/imbuf/intern/rectop.c
branches/soc-2012-sushi/source/blender/imbuf/intern/rotate.c
branches/soc-2012-sushi/source/blender/imbuf/intern/scaling.c
branches/soc-2012-sushi/source/blender/imbuf/intern/targa.c
branches/soc-2012-sushi/source/blender/imbuf/intern/thumbs.c
branches/soc-2012-sushi/source/blender/imbuf/intern/tiff.c
branches/soc-2012-sushi/source/blender/imbuf/intern/util.c
branches/soc-2012-sushi/source/blender/makesdna/DNA_action_types.h
branches/soc-2012-sushi/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2012-sushi/source/blender/makesdna/DNA_mask_types.h
branches/soc-2012-sushi/source/blender/makesdna/DNA_material_types.h
branches/soc-2012-sushi/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2012-sushi/source/blender/makesdna/DNA_node_types.h
branches/soc-2012-sushi/source/blender/makesdna/DNA_object_types.h
branches/soc-2012-sushi/source/blender/makesdna/DNA_scene_types.h
branches/soc-2012-sushi/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2012-sushi/source/blender/makesdna/DNA_space_types.h
branches/soc-2012-sushi/source/blender/makesdna/DNA_texture_types.h
branches/soc-2012-sushi/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2012-sushi/source/blender/makesdna/DNA_vfont_types.h
branches/soc-2012-sushi/source/blender/makesdna/DNA_view2d_types.h
branches/soc-2012-sushi/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2012-sushi/source/blender/makesrna/RNA_access.h
branches/soc-2012-sushi/source/blender/makesrna/intern/makesrna.c
branches/soc-2012-sushi/source/blender/makesrna/intern/rna_ID.c
branches/soc-2012-sushi/source/blender/makesrna/intern/rna_access.c
branches/soc-2012-sushi/source/blender/makesrna/intern/rna_armature.c
branches/soc-2012-sushi/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2012-sushi/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2012-sushi/source/blender/makesrna/intern/rna_mask.c
branches/soc-2012-sushi/source/blender/makesrna/intern/rna_movieclip.c
branches/soc-2012-sushi/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2012-sushi/source/blender/makesrna/intern/rna_nodetree_types.h
branches/soc-2012-sushi/source/blender/makesrna/intern/rna_object.c
branches/soc-2012-sushi/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2012-sushi/source/blender/makesrna/intern/rna_scene.c
branches/soc-2012-sushi/source/blender/makesrna/intern/rna_screen.c
branches/soc-2012-sushi/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2012-sushi/source/blender/makesrna/intern/rna_sequencer_api.c
branches/soc-2012-sushi/source/blender/makesrna/intern/rna_space.c
branches/soc-2012-sushi/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2012-sushi/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2012-sushi/source/blender/makesrna/intern/rna_vfont.c
branches/soc-2012-sushi/source/blender/modifiers/intern/MOD_boolean_util.c
branches/soc-2012-sushi/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2012-sushi/source/blender/modifiers/intern/MOD_collision.c
branches/soc-2012-sushi/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2012-sushi/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2012-sushi/source/blender/modifiers/intern/MOD_skin.c
branches/soc-2012-sushi/source/blender/nodes/CMakeLists.txt
branches/soc-2012-sushi/source/blender/nodes/NOD_composite.h
branches/soc-2012-sushi/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2012-sushi/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/soc-2012-sushi/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/soc-2012-sushi/source/blender/nodes/composite/nodes/node_composite_trackpos.c
branches/soc-2012-sushi/source/blender/nodes/intern/node_common.c
branches/soc-2012-sushi/source/blender/nodes/intern/node_common.h
branches/soc-2012-sushi/source/blender/nodes/intern/node_util.c
branches/soc-2012-sushi/source/blender/nodes/shader/node_shader_tree.c
branches/soc-2012-sushi/source/blender/nodes/texture/node_texture_tree.c
branches/soc-2012-sushi/source/blender/python/bmesh/bmesh_py_ops.c
branches/soc-2012-sushi/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2012-sushi/source/blender/python/intern/bpy_app.c
branches/soc-2012-sushi/source/blender/python/intern/bpy_interface.c
branches/soc-2012-sushi/source/blender/python/intern/bpy_props.c
branches/soc-2012-sushi/source/blender/python/intern/bpy_rna.c
branches/soc-2012-sushi/source/blender/render/extern/include/RE_render_ext.h
branches/soc-2012-sushi/source/blender/render/intern/include/texture.h
branches/soc-2012-sushi/source/blender/render/intern/include/zbuf.h
branches/soc-2012-sushi/source/blender/render/intern/raytrace/bvh.h
branches/soc-2012-sushi/source/blender/render/intern/raytrace/rayobject.cpp
branches/soc-2012-sushi/source/blender/render/intern/raytrace/rayobject_instance.cpp
branches/soc-2012-sushi/source/blender/render/intern/source/convertblender.c
branches/soc-2012-sushi/source/blender/render/intern/source/external_engine.c
branches/soc-2012-sushi/source/blender/render/intern/source/imagetexture.c
branches/soc-2012-sushi/source/blender/render/intern/source/pipeline.c
branches/soc-2012-sushi/source/blender/render/intern/source/pixelblending.c
branches/soc-2012-sushi/source/blender/render/intern/source/render_texture.c
branches/soc-2012-sushi/source/blender/render/intern/source/shadbuf.c
branches/soc-2012-sushi/source/blender/render/intern/source/texture_ocean.c
branches/soc-2012-sushi/source/blender/render/intern/source/zbuf.c
branches/soc-2012-sushi/source/blender/windowmanager/CMakeLists.txt
branches/soc-2012-sushi/source/blender/windowmanager/SConscript
branches/soc-2012-sushi/source/blender/windowmanager/WM_api.h
branches/soc-2012-sushi/source/blender/windowmanager/WM_types.h
branches/soc-2012-sushi/source/blender/windowmanager/intern/wm_apple.c
branches/soc-2012-sushi/source/blender/windowmanager/intern/wm_cursors.c
branches/soc-2012-sushi/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2012-sushi/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2012-sushi/source/blender/windowmanager/intern/wm_files.c
branches/soc-2012-sushi/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2012-sushi/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2012-sushi/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2012-sushi/source/blender/windowmanager/intern/wm_subwindow.c
branches/soc-2012-sushi/source/blender/windowmanager/intern/wm_window.c
branches/soc-2012-sushi/source/blender/windowmanager/wm_event_types.h
branches/soc-2012-sushi/source/blenderplayer/CMakeLists.txt
branches/soc-2012-sushi/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2012-sushi/source/creator/CMakeLists.txt
branches/soc-2012-sushi/source/creator/creator.c
branches/soc-2012-sushi/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/soc-2012-sushi/source/gameengine/Converter/BL_ArmatureObject.h
branches/soc-2012-sushi/source/gameengine/Expressions/PyObjectPlus.h
branches/soc-2012-sushi/source/gameengine/Expressions/StringValue.h
branches/soc-2012-sushi/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
branches/soc-2012-sushi/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/soc-2012-sushi/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2012-sushi/source/gameengine/GamePlayer/ghost/GPG_Application.h
branches/soc-2012-sushi/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2012-sushi/source/gameengine/Ketsji/BL_Action.cpp
branches/soc-2012-sushi/source/gameengine/Ketsji/BL_Texture.cpp
branches/soc-2012-sushi/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2012-sushi/source/gameengine/Ketsji/KX_Dome.cpp
branches/soc-2012-sushi/source/gameengine/Ketsji/KX_FontObject.cpp
branches/soc-2012-sushi/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2012-sushi/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2012-sushi/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
branches/soc-2012-sushi/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h
branches/soc-2012-sushi/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
branches/soc-2012-sushi/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2012-sushi/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/soc-2012-sushi/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/soc-2012-sushi/source/gameengine/VideoTexture/ImageRender.cpp
Added Paths:
-----------
branches/soc-2012-sushi/release/datafiles/bfont.pfb
branches/soc-2012-sushi/release/datafiles/prvicons.png
branches/soc-2012-sushi/release/datafiles/startup.blend
branches/soc-2012-sushi/release/scripts/presets/tracking_settings/planar.py
branches/soc-2012-sushi/release/scripts/startup/bl_operators/node.py
branches/soc-2012-sushi/source/blender/blenlib/BLI_stack.h
branches/soc-2012-sushi/source/blender/blenlib/intern/stack.c
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_InpaintNode.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_InpaintNode.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_InpaintOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_InpaintOperation.h
branches/soc-2012-sushi/source/blender/datatoc/
branches/soc-2012-sushi/source/blender/datatoc/CMakeLists.txt
branches/soc-2012-sushi/source/blender/datatoc/datatoc.c
branches/soc-2012-sushi/source/blender/editors/space_node/node_view.c
branches/soc-2012-sushi/source/blender/nodes/composite/nodes/node_composite_inpaint.c
branches/soc-2012-sushi/source/blender/windowmanager/intern/wm_playanim.c
Removed Paths:
-------------
branches/soc-2012-sushi/intern/bsp/test/
branches/soc-2012-sushi/release/datafiles/.Bfont
branches/soc-2012-sushi/release/datafiles/clkernelstoh.py
branches/soc-2012-sushi/release/datafiles/prvicons
branches/soc-2012-sushi/release/scripts/presets/tracking_settings/blurry_movie.py
branches/soc-2012-sushi/source/blender/compositor/operations/COM_DistanceMatteOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_DistanceMatteOperation.h
branches/soc-2012-sushi/source/blender/compositor/operations/COM_OpenCLKernels.cl.h
branches/soc-2012-sushi/source/blender/datatoc/CMakeLists.txt
branches/soc-2012-sushi/source/blender/datatoc/datatoc.c
branches/soc-2012-sushi/source/blender/editors/datafiles/Bfont.c
branches/soc-2012-sushi/source/blender/editors/datafiles/add.png.c
branches/soc-2012-sushi/source/blender/editors/datafiles/bfont.ttf.c
branches/soc-2012-sushi/source/blender/editors/datafiles/blender_icons.png.c
branches/soc-2012-sushi/source/blender/editors/datafiles/blob.png.c
branches/soc-2012-sushi/source/blender/editors/datafiles/blur.png.c
branches/soc-2012-sushi/source/blender/editors/datafiles/bmonofont.ttf.c
branches/soc-2012-sushi/source/blender/editors/datafiles/clay.png.c
branches/soc-2012-sushi/source/blender/editors/datafiles/claystrips.png.c
branches/soc-2012-sushi/source/blender/editors/datafiles/clone.png.c
branches/soc-2012-sushi/source/blender/editors/datafiles/crease.png.c
branches/soc-2012-sushi/source/blender/editors/datafiles/darken.png.c
branches/soc-2012-sushi/source/blender/editors/datafiles/draw.png.c
branches/soc-2012-sushi/source/blender/editors/datafiles/fill.png.c
branches/soc-2012-sushi/source/blender/editors/datafiles/flatten.png.c
branches/soc-2012-sushi/source/blender/editors/datafiles/grab.png.c
branches/soc-2012-sushi/source/blender/editors/datafiles/inflate.png.c
branches/soc-2012-sushi/source/blender/editors/datafiles/layer.png.c
branches/soc-2012-sushi/source/blender/editors/datafiles/lighten.png.c
branches/soc-2012-sushi/source/blender/editors/datafiles/mask.png.c
branches/soc-2012-sushi/source/blender/editors/datafiles/mix.png.c
branches/soc-2012-sushi/source/blender/editors/datafiles/multiply.png.c
branches/soc-2012-sushi/source/blender/editors/datafiles/nudge.png.c
branches/soc-2012-sushi/source/blender/editors/datafiles/pinch.png.c
branches/soc-2012-sushi/source/blender/editors/datafiles/preview.blend.c
branches/soc-2012-sushi/source/blender/editors/datafiles/prvicons.c
branches/soc-2012-sushi/source/blender/editors/datafiles/scrape.png.c
branches/soc-2012-sushi/source/blender/editors/datafiles/smear.png.c
branches/soc-2012-sushi/source/blender/editors/datafiles/smooth.png.c
branches/soc-2012-sushi/source/blender/editors/datafiles/snake_hook.png.c
branches/soc-2012-sushi/source/blender/editors/datafiles/soften.png.c
branches/soc-2012-sushi/source/blender/editors/datafiles/splash.png.c
branches/soc-2012-sushi/source/blender/editors/datafiles/startup.blend.c
branches/soc-2012-sushi/source/blender/editors/datafiles/subtract.png.c
branches/soc-2012-sushi/source/blender/editors/datafiles/texdraw.png.c
branches/soc-2012-sushi/source/blender/editors/datafiles/thumb.png.c
branches/soc-2012-sushi/source/blender/editors/datafiles/twist.png.c
branches/soc-2012-sushi/source/blender/editors/datafiles/vertexdraw.png.c
branches/soc-2012-sushi/source/blender/editors/space_node/node_state.c
branches/soc-2012-sushi/source/blender/gpu/shaders/gpu_shader_material.glsl.c
branches/soc-2012-sushi/source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_frag.glsl.c
branches/soc-2012-sushi/source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_vert.glsl.c
branches/soc-2012-sushi/source/blender/gpu/shaders/gpu_shader_vertex.glsl.c
branches/soc-2012-sushi/source/blender/gpu/shaders/gpu_shader_vsm_store_frag.glsl.c
branches/soc-2012-sushi/source/blender/gpu/shaders/gpu_shader_vsm_store_vert.glsl.c
Property Changed:
----------------
branches/soc-2012-sushi/
branches/soc-2012-sushi/source/blender/editors/interface/interface.c
branches/soc-2012-sushi/source/blender/editors/space_outliner/
Property changes on: branches/soc-2012-sushi
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466
/trunk/blender:46810-49508
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466
/trunk/blender:46810-50014
Modified: branches/soc-2012-sushi/CMakeLists.txt
===================================================================
--- branches/soc-2012-sushi/CMakeLists.txt 2012-08-19 13:57:55 UTC (rev 50016)
+++ branches/soc-2012-sushi/CMakeLists.txt 2012-08-19 14:07:51 UTC (rev 50017)
@@ -126,6 +126,7 @@
option(WITH_PYTHON_MODULE "Enable building as a python module which runs without a user interface, like running regular blender in background mode (experimental, only enable for development)" OFF)
option(WITH_BUILDINFO "Include extra build details (only disable for development & faster builds)" ON)
option(WITH_IK_ITASC "Enable ITASC IK solver (only disable for development & for incompatible C++ compilers)" ON)
+option(WITH_IK_SOLVER "Enable Legacy IK solver (only disable for development)" ON)
option(WITH_FFTW3 "Enable FFTW3 support (Used for smoke and audio effects)" OFF)
option(WITH_BULLET "Enable Bullet (Physics Engine)" ON)
option(WITH_GAMEENGINE "Enable Game Engine" ON)
@@ -247,7 +248,7 @@
option(WITH_CYCLES_TEST "Build cycles test application" OFF)
option(WITH_CYCLES_OSL "Build Cycles with OSL support" OFF)
option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF)
-set(CYCLES_CUDA_BINARIES_ARCH sm_13 sm_20 sm_21 CACHE STRING "CUDA architectures to build binaries for")
+set(CYCLES_CUDA_BINARIES_ARCH sm_13 sm_20 sm_21 sm_30 CACHE STRING "CUDA architectures to build binaries for")
mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
unset(PLATFORM_DEFAULT)
@@ -271,7 +272,9 @@
endif()
execute_process(COMMAND uname -r OUTPUT_VARIABLE MAC_SYS) # check for actual system-version
- if (${MAC_SYS} MATCHES 11)
+ if (${MAC_SYS} MATCHES 12)
+ set(OSX_SYSTEM 10.8)
+ elseif (${MAC_SYS} MATCHES 11)
set(OSX_SYSTEM 10.7)
elseif(${MAC_SYS} MATCHES 10)
set(OSX_SYSTEM 10.6)
@@ -853,7 +856,7 @@
if(WITH_MOD_CLOTH_ELTOPO)
set(LAPACK ${LIBDIR}/lapack)
# set(LAPACK_INCLUDE_DIR ${LAPACK}/include)
- set_lib_path(LAPACK_LIBPATH ${LAPACK}/lib)
+ set(LAPACK_LIBPATH ${LAPACK}/lib)
set(LAPACK_LIBRARIES
${LIBDIR}/lapack/lib/libf2c.lib
${LIBDIR}/lapack/lib/clapack_nowrap.lib
@@ -893,6 +896,7 @@
endif()
if(WITH_OPENCOLLADA)
+ set(OPENCOLLADA ${LIBDIR}/opencollada)
set(OPENCOLLADA_INCLUDE_DIRS
${LIBDIR}/opencollada/include/COLLADAStreamWriter/include
@@ -901,23 +905,22 @@
${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader/include
${LIBDIR}/opencollada/include/GeneratedSaxParser/include
)
-
- set_lib_path(OPENCOLLADA_LIBPATH "opencollada/lib")
+ set_lib_path(OPENCOLLADA_LIBPATH "opencollada")
set(OPENCOLLADA_LIBRARIES
- ${OPENCOLLADA_LIBPATH}/OpenCOLLADASaxFrameworkLoader.lib
- ${OPENCOLLADA_LIBPATH}/OpenCOLLADAFramework.lib
- ${OPENCOLLADA_LIBPATH}/OpenCOLLADABaseUtils.lib
- ${OPENCOLLADA_LIBPATH}/OpenCOLLADAStreamWriter.lib
- ${OPENCOLLADA_LIBPATH}/MathMLSolver.lib
- ${OPENCOLLADA_LIBPATH}/GeneratedSaxParser.lib
- ${OPENCOLLADA_LIBPATH}/xml2.lib
- ${OPENCOLLADA_LIBPATH}/buffer.lib
- ${OPENCOLLADA_LIBPATH}/ftoa.lib
- ${OPENCOLLADA_LIBPATH}/UTF.lib
+ ${OPENCOLLADA_LIBPATH}/lib/OpenCOLLADASaxFrameworkLoader.lib
+ ${OPENCOLLADA_LIBPATH}/lib/OpenCOLLADAFramework.lib
+ ${OPENCOLLADA_LIBPATH}/lib/OpenCOLLADABaseUtils.lib
+ ${OPENCOLLADA_LIBPATH}/lib/OpenCOLLADAStreamWriter.lib
+ ${OPENCOLLADA_LIBPATH}/lib/MathMLSolver.lib
+ ${OPENCOLLADA_LIBPATH}/lib/GeneratedSaxParser.lib
+ ${OPENCOLLADA_LIBPATH}/lib/xml2.lib
+ ${OPENCOLLADA_LIBPATH}/lib/buffer.lib
+ ${OPENCOLLADA_LIBPATH}/lib/ftoa.lib
+ ${OPENCOLLADA_LIBPATH}/lib/UTF.lib
)
set(PCRE_LIBRARIES
- ${OPENCOLLADA_LIBPATH}/pcre.lib
+ ${OPENCOLLADA_LIBPATH}/lib/pcre.lib
)
unset(OPENCOLLADA_LIBPATH)
@@ -940,7 +943,8 @@
if(WITH_IMAGE_OPENEXR)
set_lib_path(OPENEXR "openexr")
- set_lib_path(OPENEXR_LIBPATH "openexr/lib")
+ set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
+ set(OPENEXR_LIBPATH ${OPENEXR}/lib)
set(OPENEXR_LIBRARIES
${OPENEXR_LIBPATH}/Iex.lib
${OPENEXR_LIBPATH}/Half.lib
@@ -948,15 +952,12 @@
${OPENEXR_LIBPATH}/Imath.lib
${OPENEXR_LIBPATH}/IlmThread.lib
)
- set_lib_path(OPENEXR_INCUDE "openexr/include")
set(OPENEXR_INCLUDE_DIRS
- ${OPENEXR_INCUDE}
- ${OPENEXR_INCUDE}/IlmImf
- ${OPENEXR_INCUDE}/Iex
- ${OPENEXR_INCUDE}/Imath
+ ${OPENEXR_INCLUDE_DIR}
+ ${OPENEXR_INCLUDE_DIR}/IlmImf
+ ${OPENEXR_INCLUDE_DIR}/Iex
+ ${OPENEXR_INCLUDE_DIR}/Imath
)
- unset(OPENEXR_INCUDE)
- unset(OPENEXR_LIBPATH)
endif()
if(WITH_IMAGE_TIFF)
@@ -975,9 +976,11 @@
if(WITH_PYTHON)
# normally cached but not since we include them with blender
set(PYTHON_VERSION 3.2) # CACHE STRING)
- set_lib_path(PYTHON_INCLUDE_DIR "python/include/python${PYTHON_VERSION}")
- set_lib_path(PYTHON_LIBRARY "python/lib/python32.lib") #CACHE FILEPATH)
-
+ set_lib_path(PYTHON "python")
+ set(PYTHON_LIBRARY ${PYTHON}/lib/python32.lib) #CACHE FILEPATH
+ #Shared includes for both vc2008 and vc2010
+ set(PYTHON_INCLUDE_DIR ${LIBDIR}/python/include/python${PYTHON_VERSION})
+
# uncached vars
set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
set(PYTHON_LIBRARIES "${PYTHON_LIBRARY}")
@@ -987,7 +990,7 @@
set(BOOST ${LIBDIR}/boost)
set(BOOST_INCLUDE_DIR ${BOOST}/include)
if(MSVC10)
- set(BOOST_LIBPATH ${BOOST}/lib/vc_10)
+ set(BOOST_LIBPATH ${BOOST}/vc2010/lib)
set(BOOST_POSTFIX "vc100-mt-s-1_49.lib")
set(BOOST_DEBUG_POSTFIX "vc100-mt-sgd-1_49.lib")
else()
@@ -1007,7 +1010,7 @@
set(OPENIMAGEIO ${LIBDIR}/openimageio)
set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
set(OPENIMAGEIO_LIBRARIES OpenImageIO)
- set_lib_path(OPENIMAGEIO_LIBPATH "openimageio/lib")
+ set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
set(OPENIMAGEIO_DEFINITIONS)
endif()
@@ -1119,17 +1122,10 @@
endif()
if(WITH_IMAGE_OPENEXR)
- if(MSVC10)
- set(OPENEXR ${LIBDIR}/openexr)
- set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/vc_10)
- set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread Iex)
- set(OPENEXR_LIBPATH ${OPENEXR}/lib/vc_10)
- else()
- set(OPENEXR ${LIBDIR}/openexr)
- set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include)
- set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread Iex)
- set(OPENEXR_LIBPATH ${OPENEXR}/lib)
- endif()
+ set(OPENEXR ${LIBDIR}/openexr)
+ set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
+ set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread Iex)
+ set(OPENEXR_LIBPATH ${OPENEXR}/lib)
endif()
if(WITH_IMAGE_TIFF)
@@ -1489,6 +1485,16 @@
if(MSVC)
# for some reason this fails on msvc
add_definitions(-D__LITTLE_ENDIAN__)
+
+# OSX-Note: as we do crosscompiling with specific set architecture,
+# endianess-detection and autosetting is counterproductive
+# so we just set endianess according CMAKE_OSX_ARCHITECTURES
+
+elseif(CMAKE_OSX_ARCHITECTURES MATCHES i386 OR CMAKE_OSX_ARCHITECTURES MATCHES x86_64)
+ add_definitions(-D__LITTLE_ENDIAN__)
+elseif(CMAKE_OSX_ARCHITECTURES MATCHES ppc OR CMAKE_OSX_ARCHITECTURES MATCHES ppc64)
+ add_definitions(-D__BIG_ENDIAN__)
+
else()
include(TestBigEndian)
test_big_endian(_SYSTEM_BIG_ENDIAN)
Modified: branches/soc-2012-sushi/GNUmakefile
===================================================================
--- branches/soc-2012-sushi/GNUmakefile 2012-08-19 13:57:55 UTC (rev 50016)
+++ branches/soc-2012-sushi/GNUmakefile 2012-08-19 14:07:51 UTC (rev 50017)
@@ -19,9 +19,9 @@
#
# ##### END GPL LICENSE BLOCK #####
-# This Makefile does an out-of-source CMake build in ../build/`OS`_`CPU`
+# This Makefile does an out-of-source CMake build in ../build_`OS`_`CPU`
# eg:
-# ../build/Linux_i386
+# ../build_linux_i386
# This is for users who like to configure & build blender with a single command.
@@ -40,7 +40,7 @@
endif
ifndef BUILD_DIR
- BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS_NCASE)
+ BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build_$(OS_NCASE)
endif
Modified: branches/soc-2012-sushi/SConstruct
===================================================================
--- branches/soc-2012-sushi/SConstruct 2012-08-19 13:57:55 UTC (rev 50016)
+++ branches/soc-2012-sushi/SConstruct 2012-08-19 14:07:51 UTC (rev 50017)
@@ -92,7 +92,7 @@
if not use_color=='1':
B.bc.disable()
-
+
#on defaut white Os X terminal, some colors are totally unlegible
if platform=='darwin':
B.bc.OKGREEN = '\033[34m'
@@ -123,8 +123,8 @@
B.bitness = bitness
else:
B.bitness = tempbitness
-
+
# first check cmdline for toolset and we create env to work on
quickie = B.arguments.get('BF_QUICK', None)
quickdebug = B.arguments.get('BF_QUICKDEBUG', None)
@@ -138,7 +138,7 @@
B.quickie=string.split(quickie,',')
else:
B.quickie=[]
-
+
toolset = B.arguments.get('BF_TOOLSET', None)
if toolset:
print "Using " + toolset
@@ -270,7 +270,7 @@
target_env_defs['WITH_BF_PYTHON'] = False
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list