[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42743] branches/soc-2011-cucumber: Merge with trunk to r42742

[Daniel Stokes]

Revision: 42743
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42743
Author:   kupoman
Date:     2011-12-20 00:42:05 +0000 (Tue, 20 Dec 2011)
Log Message:
-----------
Merge with trunk to r42742

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42742

Modified Paths:
--------------
    branches/soc-2011-cucumber/CMakeLists.txt
    branches/soc-2011-cucumber/GNUmakefile
    branches/soc-2011-cucumber/SConstruct
    branches/soc-2011-cucumber/build_files/buildbot/config/user-config-i686.py
    branches/soc-2011-cucumber/build_files/buildbot/config/user-config-player-i686.py
    branches/soc-2011-cucumber/build_files/buildbot/config/user-config-player-x86_64.py
    branches/soc-2011-cucumber/build_files/buildbot/config/user-config-x86_64.py
    branches/soc-2011-cucumber/build_files/buildbot/master.cfg
    branches/soc-2011-cucumber/build_files/buildbot/slave_pack.py
    branches/soc-2011-cucumber/build_files/cmake/Modules/FindPythonLibsUnix.cmake
    branches/soc-2011-cucumber/build_files/cmake/cmake_consistency_check.py
    branches/soc-2011-cucumber/build_files/cmake/cmake_qtcreator_project.py
    branches/soc-2011-cucumber/build_files/cmake/config/blender_lite.cmake
    branches/soc-2011-cucumber/build_files/cmake/project_info.py
    branches/soc-2011-cucumber/build_files/cmake/project_source_info.py
    branches/soc-2011-cucumber/build_files/scons/config/darwin-config.py
    branches/soc-2011-cucumber/build_files/scons/config/freebsd7-config.py
    branches/soc-2011-cucumber/build_files/scons/config/freebsd8-config.py
    branches/soc-2011-cucumber/build_files/scons/config/freebsd9-config.py
    branches/soc-2011-cucumber/build_files/scons/config/linux-config.py
    branches/soc-2011-cucumber/build_files/scons/config/linuxcross-config.py
    branches/soc-2011-cucumber/build_files/scons/config/win32-mingw-config.py
    branches/soc-2011-cucumber/build_files/scons/config/win32-vc-config.py
    branches/soc-2011-cucumber/build_files/scons/config/win64-vc-config.py
    branches/soc-2011-cucumber/build_files/scons/tools/Blender.py
    branches/soc-2011-cucumber/build_files/scons/tools/btools.py
    branches/soc-2011-cucumber/build_files/scons/tools/mstoolkit.py
    branches/soc-2011-cucumber/doc/manpage/blender.1
    branches/soc-2011-cucumber/doc/manpage/blender.1.py
    branches/soc-2011-cucumber/doc/python_api/examples/bge.texture.1.py
    branches/soc-2011-cucumber/doc/python_api/rst/gpu.rst
    branches/soc-2011-cucumber/doc/python_api/rst/info_best_practice.rst
    branches/soc-2011-cucumber/doc/python_api/rst/info_gotcha.rst
    branches/soc-2011-cucumber/doc/python_api/sphinx_doc_gen.py
    branches/soc-2011-cucumber/extern/eltopo/CMakeLists.txt
    branches/soc-2011-cucumber/extern/eltopo/common/gluvi.h
    branches/soc-2011-cucumber/extern/eltopo/common/predicates.cpp
    branches/soc-2011-cucumber/extern/eltopo/common/tunicate/orientation.cpp
    branches/soc-2011-cucumber/extern/eltopo/common/tunicate/sos_orientation.cpp
    branches/soc-2011-cucumber/extern/eltopo/eltopo3d/dynamicsurface.cpp
    branches/soc-2011-cucumber/extern/eltopo/eltopo3d/surftrack.cpp
    branches/soc-2011-cucumber/extern/libmv/CMakeLists.txt
    branches/soc-2011-cucumber/extern/libmv/SConscript
    branches/soc-2011-cucumber/extern/libmv/bundle.sh
    branches/soc-2011-cucumber/extern/libmv/files.txt
    branches/soc-2011-cucumber/extern/libmv/libmv/numeric/numeric.h
    branches/soc-2011-cucumber/extern/libmv/libmv/simple_pipeline/bundle.cc
    branches/soc-2011-cucumber/extern/libmv/libmv/simple_pipeline/bundle.h
    branches/soc-2011-cucumber/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc
    branches/soc-2011-cucumber/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h
    branches/soc-2011-cucumber/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc
    branches/soc-2011-cucumber/extern/libmv/libmv/simple_pipeline/pipeline.cc
    branches/soc-2011-cucumber/extern/libmv/libmv/simple_pipeline/pipeline.h
    branches/soc-2011-cucumber/extern/libmv/libmv/tracking/klt_region_tracker.cc
    branches/soc-2011-cucumber/extern/libmv/libmv/tracking/pyramid_region_tracker.cc
    branches/soc-2011-cucumber/extern/libmv/libmv/tracking/sad.cc
    branches/soc-2011-cucumber/extern/libmv/libmv/tracking/trklt_region_tracker.cc
    branches/soc-2011-cucumber/extern/libmv/libmv-capi.cpp
    branches/soc-2011-cucumber/extern/libmv/libmv-capi.h
    branches/soc-2011-cucumber/extern/libmv/mkfiles.sh
    branches/soc-2011-cucumber/extern/libmv/third_party/glog/src/config.h
    branches/soc-2011-cucumber/extern/libmv/third_party/glog/src/config_linux.h
    branches/soc-2011-cucumber/extern/libmv/third_party/ssba/Geometry/v3d_metricbundle.cpp
    branches/soc-2011-cucumber/extern/libmv/third_party/ssba/Geometry/v3d_metricbundle.h
    branches/soc-2011-cucumber/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
    branches/soc-2011-cucumber/intern/audaspace/intern/AUD_C-API.cpp
    branches/soc-2011-cucumber/intern/audaspace/intern/AUD_ConverterReader.cpp
    branches/soc-2011-cucumber/intern/audaspace/intern/AUD_LinearResampleReader.cpp
    branches/soc-2011-cucumber/intern/audaspace/jack/AUD_JackDevice.h
    branches/soc-2011-cucumber/intern/boolop/intern/BOP_Face2Face.cpp
    branches/soc-2011-cucumber/intern/boolop/intern/BOP_Interface.cpp
    branches/soc-2011-cucumber/intern/boolop/intern/BOP_Mesh.cpp
    branches/soc-2011-cucumber/intern/bsp/intern/CSG_BooleanOps.cpp
    branches/soc-2011-cucumber/intern/container/CTR_UHeap.h
    branches/soc-2011-cucumber/intern/cycles/CMakeLists.txt
    branches/soc-2011-cucumber/intern/cycles/SConscript
    branches/soc-2011-cucumber/intern/cycles/app/cycles_xml.cpp
    branches/soc-2011-cucumber/intern/cycles/blender/CMakeLists.txt
    branches/soc-2011-cucumber/intern/cycles/blender/addon/__init__.py
    branches/soc-2011-cucumber/intern/cycles/blender/addon/engine.py
    branches/soc-2011-cucumber/intern/cycles/blender/addon/enums.py
    branches/soc-2011-cucumber/intern/cycles/blender/addon/presets.py
    branches/soc-2011-cucumber/intern/cycles/blender/addon/properties.py
    branches/soc-2011-cucumber/intern/cycles/blender/addon/ui.py
    branches/soc-2011-cucumber/intern/cycles/blender/blender_camera.cpp
    branches/soc-2011-cucumber/intern/cycles/blender/blender_mesh.cpp
    branches/soc-2011-cucumber/intern/cycles/blender/blender_object.cpp
    branches/soc-2011-cucumber/intern/cycles/blender/blender_shader.cpp
    branches/soc-2011-cucumber/intern/cycles/blender/blender_sync.cpp
    branches/soc-2011-cucumber/intern/cycles/blender/blender_sync.h
    branches/soc-2011-cucumber/intern/cycles/blender/blender_util.h
    branches/soc-2011-cucumber/intern/cycles/bvh/bvh_build.cpp
    branches/soc-2011-cucumber/intern/cycles/cmake/external_libs.cmake
    branches/soc-2011-cucumber/intern/cycles/device/CMakeLists.txt
    branches/soc-2011-cucumber/intern/cycles/device/device.h
    branches/soc-2011-cucumber/intern/cycles/device/device_cpu.cpp
    branches/soc-2011-cucumber/intern/cycles/device/device_cuda.cpp
    branches/soc-2011-cucumber/intern/cycles/device/device_multi.cpp
    branches/soc-2011-cucumber/intern/cycles/device/device_opencl.cpp
    branches/soc-2011-cucumber/intern/cycles/kernel/CMakeLists.txt
    branches/soc-2011-cucumber/intern/cycles/kernel/kernel.cl
    branches/soc-2011-cucumber/intern/cycles/kernel/kernel.h
    branches/soc-2011-cucumber/intern/cycles/kernel/kernel_bvh.h
    branches/soc-2011-cucumber/intern/cycles/kernel/kernel_camera.h
    branches/soc-2011-cucumber/intern/cycles/kernel/kernel_compat_cpu.h
    branches/soc-2011-cucumber/intern/cycles/kernel/kernel_compat_cuda.h
    branches/soc-2011-cucumber/intern/cycles/kernel/kernel_compat_opencl.h
    branches/soc-2011-cucumber/intern/cycles/kernel/kernel_globals.h
    branches/soc-2011-cucumber/intern/cycles/kernel/kernel_random.h
    branches/soc-2011-cucumber/intern/cycles/kernel/kernel_shader.h
    branches/soc-2011-cucumber/intern/cycles/kernel/kernel_types.h
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/CMakeLists.txt
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/CMakeLists.txt
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_color.h
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_diffuse_bsdf.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_mix.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/stdosl.h
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/osl_closures.cpp
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/osl_closures.h
    branches/soc-2011-cucumber/intern/cycles/kernel/svm/bsdf_ashikhmin_velvet.h
    branches/soc-2011-cucumber/intern/cycles/kernel/svm/bsdf_microfacet.h
    branches/soc-2011-cucumber/intern/cycles/kernel/svm/svm.h
    branches/soc-2011-cucumber/intern/cycles/kernel/svm/svm_bsdf.h
    branches/soc-2011-cucumber/intern/cycles/kernel/svm/svm_closure.h
    branches/soc-2011-cucumber/intern/cycles/kernel/svm/svm_mix.h
    branches/soc-2011-cucumber/intern/cycles/kernel/svm/svm_types.h
    branches/soc-2011-cucumber/intern/cycles/render/CMakeLists.txt
    branches/soc-2011-cucumber/intern/cycles/render/filter.cpp
    branches/soc-2011-cucumber/intern/cycles/render/graph.cpp
    branches/soc-2011-cucumber/intern/cycles/render/graph.h
    branches/soc-2011-cucumber/intern/cycles/render/mesh.cpp
    branches/soc-2011-cucumber/intern/cycles/render/mesh.h
    branches/soc-2011-cucumber/intern/cycles/render/nodes.cpp
    branches/soc-2011-cucumber/intern/cycles/render/nodes.h
    branches/soc-2011-cucumber/intern/cycles/render/object.cpp
    branches/soc-2011-cucumber/intern/cycles/render/session.cpp
    branches/soc-2011-cucumber/intern/cycles/render/session.h
    branches/soc-2011-cucumber/intern/cycles/render/sobol.cpp
    branches/soc-2011-cucumber/intern/cycles/render/sobol.h
    branches/soc-2011-cucumber/intern/cycles/subd/subd_mesh.cpp
    branches/soc-2011-cucumber/intern/cycles/util/CMakeLists.txt
    branches/soc-2011-cucumber/intern/cycles/util/util_boundbox.h
    branches/soc-2011-cucumber/intern/cycles/util/util_cache.h
    branches/soc-2011-cucumber/intern/cycles/util/util_cuda.cpp
    branches/soc-2011-cucumber/intern/cycles/util/util_math.h
    branches/soc-2011-cucumber/intern/cycles/util/util_md5.cpp
    branches/soc-2011-cucumber/intern/cycles/util/util_opencl.h
    branches/soc-2011-cucumber/intern/cycles/util/util_path.cpp
    branches/soc-2011-cucumber/intern/cycles/util/util_path.h
    branches/soc-2011-cucumber/intern/cycles/util/util_system.cpp
    branches/soc-2011-cucumber/intern/cycles/util/util_system.h
    branches/soc-2011-cucumber/intern/cycles/util/util_transform.h
    branches/soc-2011-cucumber/intern/cycles/util/util_types.h
    branches/soc-2011-cucumber/intern/decimation/intern/LOD_QSDecimator.cpp
    branches/soc-2011-cucumber/intern/ghost/GHOST_ISystem.h
    branches/soc-2011-cucumber/intern/ghost/GHOST_ISystemPaths.h
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_System.h
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_SystemPaths.h
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_SystemPathsCocoa.h
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_SystemPathsWin32.h
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_SystemPathsX11.h
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_SystemX11.h
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/soc-2011-cucumber/intern/ghost/test/gears/GHOST_Test.cpp
    branches/soc-2011-cucumber/intern/itasc/kdl/chain.hpp
    branches/soc-2011-cucumber/intern/itasc/kdl/tree.hpp
    branches/soc-2011-cucumber/intern/memutil/MEM_CacheLimiter.h
    branches/soc-2011-cucumber/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
    branches/soc-2011-cucumber/intern/tools/credits_svn_gen.py
    branches/soc-2011-cucumber/release/bin/blender-softwaregl
    branches/soc-2011-cucumber/release/datafiles/blender_icons.png
    branches/soc-2011-cucumber/release/datafiles/fonts/droidsans.ttf.gz
    branches/soc-2011-cucumber/release/datafiles/splash.png
    branches/soc-2011-cucumber/release/plugins/sequence/dnr.c
    branches/soc-2011-cucumber/release/plugins/sequence/gamma.c
    branches/soc-2011-cucumber/release/scripts/modules/addon_utils.py
    branches/soc-2011-cucumber/release/scripts/modules/animsys_refactor.py
    branches/soc-2011-cucumber/release/scripts/modules/bpy/path.py
    branches/soc-2011-cucumber/release/scripts/modules/bpy/utils.py
    branches/soc-2011-cucumber/release/scripts/modules/bpy_extras/image_utils.py
    branches/soc-2011-cucumber/release/scripts/modules/bpy_extras/io_utils.py
    branches/soc-2011-cucumber/release/scripts/modules/console/complete_calltip.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_operators/anim.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_operators/clip.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_operators/image.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_operators/object_randomize_transform.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_operators/presets.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_operators/uvcalc_follow_active.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_operators/uvcalc_lightmap.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_operators/wm.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/__init__.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_camera.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_speaker.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_game.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_material.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_object.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_object_constraint.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_particle.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_physics_cloth.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_physics_common.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_physics_field.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_physics_smoke.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_physics_softbody.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_render.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_scene.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_texture.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_clip.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_graph.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_image.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_info.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_nla.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_node.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_text.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_time.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2011-cucumber/release/scripts/startup/keyingsets_builtins.py
    branches/soc-2011-cucumber/release/text/readme.html
    branches/soc-2011-cucumber/source/blender/CMakeLists.txt
    branches/soc-2011-cucumber/source/blender/avi/intern/avi.c
    branches/soc-2011-cucumber/source/blender/avi/intern/codecs.c
    branches/soc-2011-cucumber/source/blender/avi/intern/endian.c
    branches/soc-2011-cucumber/source/blender/avi/intern/mjpeg.c
    branches/soc-2011-cucumber/source/blender/avi/intern/options.c
    branches/soc-2011-cucumber/source/blender/avi/intern/rgb32.c
    branches/soc-2011-cucumber/source/blender/blenfont/intern/blf_dir.c
    branches/soc-2011-cucumber/source/blender/blenfont/intern/blf_lang.c
    branches/soc-2011-cucumber/source/blender/blenfont/intern/blf_translation.c
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_anim.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_blender.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_bmesh.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_bmeshCustomData.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_bmfont.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_bvhutils.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_camera.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_customdata.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_deform.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_depsgraph.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_effect.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_fluidsim.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_group.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_idprop.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_image.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_library.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_material.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_mesh.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_modifier.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_node.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_object.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_paint.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_particle.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_pointcache.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_scene.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_screen.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_sequencer.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_texture.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_tracking.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_utildefines.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_writeavi.h
    branches/soc-2011-cucumber/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2011-cucumber/source/blender/blenkernel/SConscript
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/BME_Customdata.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/BME_mesh.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/BME_tools.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/CCGSubSurf.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/CCGSubSurf.h
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/action.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/anim.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/anim_sys.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/armature.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/blender.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/bmesh_private.h
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/bmfont.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/boids.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/brush.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/bvhutils.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/camera.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/cloth.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/collision.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/constraint.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/curve.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/customdata.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/deform.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/effect.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/fcurve.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/group.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/idprop.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/image.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/image_gen.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/implicit.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/ipo.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/lamp.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/lattice.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/library.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/material.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/mball.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/mesh.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/mesh_validate.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/modifier.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/movieclip.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/multires.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/nla.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/node.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/object.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/packedFile.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/paint.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/particle.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/scene.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/seqeffects.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/softbody.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/speaker.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/suggestions.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/text.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/texture.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/tracking.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/unit.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/world.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/writeavi.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/writeffmpeg.c
    branches/soc-2011-cucumber/source/blender/blenlib/BLI_fileops.h
    branches/soc-2011-cucumber/source/blender/blenlib/BLI_fnmatch.h
    branches/soc-2011-cucumber/source/blender/blenlib/BLI_ghash.h
    branches/soc-2011-cucumber/source/blender/blenlib/BLI_math_base.h
    branches/soc-2011-cucumber/source/blender/blenlib/BLI_math_geom.h
    branches/soc-2011-cucumber/source/blender/blenlib/BLI_math_matrix.h
    branches/soc-2011-cucumber/source/blender/blenlib/BLI_math_vector.h
    branches/soc-2011-cucumber/source/blender/blenlib/BLI_mempool.h
    branches/soc-2011-cucumber/source/blender/blenlib/BLI_pbvh.h
    branches/soc-2011-cucumber/source/blender/blenlib/BLI_string_utf8.h
    branches/soc-2011-cucumber/source/blender/blenlib/BLI_threads.h
    branches/soc-2011-cucumber/source/blender/blenlib/BLI_utildefines.h
    branches/soc-2011-cucumber/source/blender/blenlib/BLI_vfontdata.h
    branches/soc-2011-cucumber/source/blender/blenlib/intern/BLI_dynstr.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/BLI_ghash.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/BLI_heap.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/BLI_linklist.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/BLI_memarena.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/BLI_mempool.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/DLRB_tree.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/bpath.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/edgehash.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/math_base_inline.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/math_geom.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/math_matrix.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/math_rotation.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/math_vector.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/math_vector_inline.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/path_util.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/pbvh.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/rand.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/scanfill.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/storage.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/string_utf8.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/threads.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/winstuff.c
    branches/soc-2011-cucumber/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-cucumber/source/blender/blenloader/intern/readfile.h
    branches/soc-2011-cucumber/source/blender/blenloader/intern/writefile.c
    branches/soc-2011-cucumber/source/blender/collada/AnimationExporter.cpp
    branches/soc-2011-cucumber/source/blender/collada/AnimationImporter.cpp
    branches/soc-2011-cucumber/source/blender/collada/ArmatureExporter.cpp
    branches/soc-2011-cucumber/source/blender/collada/ArmatureImporter.cpp
    branches/soc-2011-cucumber/source/blender/collada/ArmatureImporter.h
    branches/soc-2011-cucumber/source/blender/collada/DocumentImporter.cpp
    branches/soc-2011-cucumber/source/blender/collada/GeometryExporter.cpp
    branches/soc-2011-cucumber/source/blender/collada/InstanceWriter.cpp
    branches/soc-2011-cucumber/source/blender/collada/MeshImporter.cpp
    branches/soc-2011-cucumber/source/blender/collada/TransformReader.cpp
    branches/soc-2011-cucumber/source/blender/collada/TransformWriter.cpp
    branches/soc-2011-cucumber/source/blender/collada/collada_utils.cpp
    branches/soc-2011-cucumber/source/blender/editors/animation/anim_channels_edit.c
    branches/soc-2011-cucumber/source/blender/editors/animation/anim_ipo_utils.c
    branches/soc-2011-cucumber/source/blender/editors/animation/anim_markers.c
    branches/soc-2011-cucumber/source/blender/editors/animation/fmodifier_ui.c
    branches/soc-2011-cucumber/source/blender/editors/animation/keyframing.c
    branches/soc-2011-cucumber/source/blender/editors/animation/keyingsets.c
    branches/soc-2011-cucumber/source/blender/editors/armature/editarmature.c
    branches/soc-2011-cucumber/source/blender/editors/armature/editarmature_retarget.c
    branches/soc-2011-cucumber/source/blender/editors/armature/editarmature_sketch.c
    branches/soc-2011-cucumber/source/blender/editors/armature/meshlaplacian.c
    branches/soc-2011-cucumber/source/blender/editors/armature/poseobject.c
    branches/soc-2011-cucumber/source/blender/editors/armature/reeb.c
    branches/soc-2011-cucumber/source/blender/editors/curve/curve_intern.h
    branches/soc-2011-cucumber/source/blender/editors/curve/curve_ops.c
    branches/soc-2011-cucumber/source/blender/editors/curve/editcurve.c
    branches/soc-2011-cucumber/source/blender/editors/datafiles/blender_icons.png.c
    branches/soc-2011-cucumber/source/blender/editors/datafiles/splash.png.c
    branches/soc-2011-cucumber/source/blender/editors/gpencil/drawgpencil.c
    branches/soc-2011-cucumber/source/blender/editors/gpencil/gpencil_buttons.c
    branches/soc-2011-cucumber/source/blender/editors/gpencil/gpencil_edit.c
    branches/soc-2011-cucumber/source/blender/editors/gpencil/gpencil_paint.c
    branches/soc-2011-cucumber/source/blender/editors/include/ED_curve.h
    branches/soc-2011-cucumber/source/blender/editors/include/ED_image.h
    branches/soc-2011-cucumber/source/blender/editors/include/ED_mesh.h
    branches/soc-2011-cucumber/source/blender/editors/include/ED_object.h
    branches/soc-2011-cucumber/source/blender/editors/include/ED_render.h
    branches/soc-2011-cucumber/source/blender/editors/include/ED_screen.h
    branches/soc-2011-cucumber/source/blender/editors/include/ED_sculpt.h
    branches/soc-2011-cucumber/source/blender/editors/include/ED_transform.h
    branches/soc-2011-cucumber/source/blender/editors/include/ED_view3d.h
    branches/soc-2011-cucumber/source/blender/editors/include/UI_icons.h
    branches/soc-2011-cucumber/source/blender/editors/include/UI_interface.h
    branches/soc-2011-cucumber/source/blender/editors/include/UI_resources.h
    branches/soc-2011-cucumber/source/blender/editors/interface/interface.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_anim.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_draw.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_handlers.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_icons.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_intern.h
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_layout.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_ops.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_panel.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_regions.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_templates.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_utils.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_widgets.c
    branches/soc-2011-cucumber/source/blender/editors/interface/resources.c
    branches/soc-2011-cucumber/source/blender/editors/interface/view2d.c
    branches/soc-2011-cucumber/source/blender/editors/interface/view2d_ops.c
    branches/soc-2011-cucumber/source/blender/editors/mesh/editmesh.c
    branches/soc-2011-cucumber/source/blender/editors/mesh/editmesh_lib.c
    branches/soc-2011-cucumber/source/blender/editors/mesh/editmesh_loop.c
    branches/soc-2011-cucumber/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2011-cucumber/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2011-cucumber/source/blender/editors/mesh/loopcut.c
    branches/soc-2011-cucumber/source/blender/editors/mesh/mesh_data.c
    branches/soc-2011-cucumber/source/blender/editors/mesh/mesh_navmesh.c
    branches/soc-2011-cucumber/source/blender/editors/mesh/meshtools.c
    branches/soc-2011-cucumber/source/blender/editors/metaball/mball_edit.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_add.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_bake.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_constraint.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_edit.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_hook.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_intern.h
    branches/soc-2011-cucumber/source/blender/editors/object/object_modifier.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_ops.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_relations.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_select.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_transform.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_vgroup.c
    branches/soc-2011-cucumber/source/blender/editors/physics/CMakeLists.txt
    branches/soc-2011-cucumber/source/blender/editors/physics/physics_fluid.c
    branches/soc-2011-cucumber/source/blender/editors/physics/physics_intern.h
    branches/soc-2011-cucumber/source/blender/editors/physics/physics_ops.c
    branches/soc-2011-cucumber/source/blender/editors/physics/physics_pointcache.c
    branches/soc-2011-cucumber/source/blender/editors/render/render_internal.c
    branches/soc-2011-cucumber/source/blender/editors/render/render_opengl.c
    branches/soc-2011-cucumber/source/blender/editors/render/render_shading.c
    branches/soc-2011-cucumber/source/blender/editors/render/render_update.c
    branches/soc-2011-cucumber/source/blender/editors/screen/area.c
    branches/soc-2011-cucumber/source/blender/editors/screen/screen_context.c
    branches/soc-2011-cucumber/source/blender/editors/screen/screen_edit.c
    branches/soc-2011-cucumber/source/blender/editors/screen/screendump.c
    branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2011-cucumber/source/blender/editors/sound/sound_ops.c
    branches/soc-2011-cucumber/source/blender/editors/space_action/action_select.c
    branches/soc-2011-cucumber/source/blender/editors/space_api/spacetypes.c
    branches/soc-2011-cucumber/source/blender/editors/space_buttons/buttons_context.c
    branches/soc-2011-cucumber/source/blender/editors/space_buttons/buttons_texture.c
    branches/soc-2011-cucumber/source/blender/editors/space_clip/clip_buttons.c
    branches/soc-2011-cucumber/source/blender/editors/space_clip/clip_draw.c
    branches/soc-2011-cucumber/source/blender/editors/space_clip/clip_graph_draw.c
    branches/soc-2011-cucumber/source/blender/editors/space_clip/clip_ops.c
    branches/soc-2011-cucumber/source/blender/editors/space_clip/clip_toolbar.c
    branches/soc-2011-cucumber/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2011-cucumber/source/blender/editors/space_console/space_console.c
    branches/soc-2011-cucumber/source/blender/editors/space_file/file_draw.c
    branches/soc-2011-cucumber/source/blender/editors/space_file/file_ops.c
    branches/soc-2011-cucumber/source/blender/editors/space_file/file_panels.c
    branches/soc-2011-cucumber/source/blender/editors/space_file/filelist.c
    branches/soc-2011-cucumber/source/blender/editors/space_file/filelist.h
    branches/soc-2011-cucumber/source/blender/editors/space_file/fsmenu.c
    branches/soc-2011-cucumber/source/blender/editors/space_graph/graph_buttons.c
    branches/soc-2011-cucumber/source/blender/editors/space_graph/graph_select.c
    branches/soc-2011-cucumber/source/blender/editors/space_image/image_buttons.c
    branches/soc-2011-cucumber/source/blender/editors/space_image/image_draw.c
    branches/soc-2011-cucumber/source/blender/editors/space_image/image_ops.c
    branches/soc-2011-cucumber/source/blender/editors/space_image/space_image.c
    branches/soc-2011-cucumber/source/blender/editors/space_info/info_report.c
    branches/soc-2011-cucumber/source/blender/editors/space_info/info_stats.c
    branches/soc-2011-cucumber/source/blender/editors/space_logic/logic_window.c
    branches/soc-2011-cucumber/source/blender/editors/space_nla/nla_buttons.c
    branches/soc-2011-cucumber/source/blender/editors/space_nla/nla_select.c
    branches/soc-2011-cucumber/source/blender/editors/space_node/drawnode.c
    branches/soc-2011-cucumber/source/blender/editors/space_node/node_buttons.c
    branches/soc-2011-cucumber/source/blender/editors/space_node/node_draw.c
    branches/soc-2011-cucumber/source/blender/editors/space_node/node_edit.c
    branches/soc-2011-cucumber/source/blender/editors/space_node/node_intern.h
    branches/soc-2011-cucumber/source/blender/editors/space_node/node_ops.c
    branches/soc-2011-cucumber/source/blender/editors/space_node/node_select.c
    branches/soc-2011-cucumber/source/blender/editors/space_node/node_state.c
    branches/soc-2011-cucumber/source/blender/editors/space_node/node_templates.c
    branches/soc-2011-cucumber/source/blender/editors/space_outliner/outliner_draw.c
    branches/soc-2011-cucumber/source/blender/editors/space_outliner/outliner_select.c
    branches/soc-2011-cucumber/source/blender/editors/space_outliner/outliner_tools.c
    branches/soc-2011-cucumber/source/blender/editors/space_outliner/outliner_tree.c
    branches/soc-2011-cucumber/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2011-cucumber/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2011-cucumber/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/soc-2011-cucumber/source/blender/editors/space_sequencer/sequencer_select.c
    branches/soc-2011-cucumber/source/blender/editors/space_sequencer/space_sequencer.c
    branches/soc-2011-cucumber/source/blender/editors/space_text/text_draw.c
    branches/soc-2011-cucumber/source/blender/editors/space_text/text_intern.h
    branches/soc-2011-cucumber/source/blender/editors/space_text/text_ops.c
    branches/soc-2011-cucumber/source/blender/editors/space_time/space_time.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/drawanimviz.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/drawarmature.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/drawvolume.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_fly.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_intern.h
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_ops.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_snap.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2011-cucumber/source/blender/editors/transform/transform.c
    branches/soc-2011-cucumber/source/blender/editors/transform/transform.h
    branches/soc-2011-cucumber/source/blender/editors/transform/transform_constraints.c
    branches/soc-2011-cucumber/source/blender/editors/transform/transform_conversions.c
    branches/soc-2011-cucumber/source/blender/editors/transform/transform_generics.c
    branches/soc-2011-cucumber/source/blender/editors/transform/transform_input.c
    branches/soc-2011-cucumber/source/blender/editors/transform/transform_manipulator.c
    branches/soc-2011-cucumber/source/blender/editors/transform/transform_ops.c
    branches/soc-2011-cucumber/source/blender/editors/transform/transform_orientations.c
    branches/soc-2011-cucumber/source/blender/editors/transform/transform_snap.c
    branches/soc-2011-cucumber/source/blender/editors/util/ed_util.c
    branches/soc-2011-cucumber/source/blender/editors/util/undo.c
    branches/soc-2011-cucumber/source/blender/editors/uvedit/uvedit_draw.c
    branches/soc-2011-cucumber/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2011-cucumber/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/soc-2011-cucumber/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2011-cucumber/source/blender/gpu/CMakeLists.txt
    branches/soc-2011-cucumber/source/blender/gpu/GPU_buffers.h
    branches/soc-2011-cucumber/source/blender/gpu/GPU_draw.h
    branches/soc-2011-cucumber/source/blender/gpu/GPU_extensions.h
    branches/soc-2011-cucumber/source/blender/gpu/GPU_material.h
    branches/soc-2011-cucumber/source/blender/gpu/SConscript
    branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_codegen.c
    branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_codegen.h
    branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_extensions.c
    branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_material.c
    branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_shader_material.glsl
    branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_shader_material.glsl.c
    branches/soc-2011-cucumber/source/blender/ikplugin/intern/iksolver_plugin.c
    branches/soc-2011-cucumber/source/blender/ikplugin/intern/itasc_plugin.cpp
    branches/soc-2011-cucumber/source/blender/imbuf/IMB_imbuf.h
    branches/soc-2011-cucumber/source/blender/imbuf/IMB_imbuf_types.h
    branches/soc-2011-cucumber/source/blender/imbuf/intern/IMB_anim.h
    branches/soc-2011-cucumber/source/blender/imbuf/intern/IMB_filter.h
    branches/soc-2011-cucumber/source/blender/imbuf/intern/IMB_indexer.h
    branches/soc-2011-cucumber/source/blender/imbuf/intern/allocimbuf.c
    branches/soc-2011-cucumber/source/blender/imbuf/intern/anim_movie.c
    branches/soc-2011-cucumber/source/blender/imbuf/intern/bmp.c
    branches/soc-2011-cucumber/source/blender/imbuf/intern/filter.c
    branches/soc-2011-cucumber/source/blender/imbuf/intern/imbuf_cocoa.m
    branches/soc-2011-cucumber/source/blender/imbuf/intern/indexer.c
    branches/soc-2011-cucumber/source/blender/imbuf/intern/iris.c
    branches/soc-2011-cucumber/source/blender/imbuf/intern/jp2.c
    branches/soc-2011-cucumber/source/blender/imbuf/intern/jpeg.c
    branches/soc-2011-cucumber/source/blender/imbuf/intern/moviecache.c
    branches/soc-2011-cucumber/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/soc-2011-cucumber/source/blender/imbuf/intern/png.c
    branches/soc-2011-cucumber/source/blender/imbuf/intern/scaling.c
    branches/soc-2011-cucumber/source/blender/imbuf/intern/targa.c
    branches/soc-2011-cucumber/source/blender/imbuf/intern/thumbs.c
    branches/soc-2011-cucumber/source/blender/imbuf/intern/thumbs_blend.c
    branches/soc-2011-cucumber/source/blender/imbuf/intern/tiff.c
    branches/soc-2011-cucumber/source/blender/imbuf/intern/util.c
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_ID.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_action_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_camera_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_constraint_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_curve_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_key_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_lamp_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_lattice_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_material_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_mesh_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_meshdata_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_meta_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_modifier_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_node_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_object_fluidsim.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_object_force.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_object_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_particle_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_sensor_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_sequence_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_space_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_texture_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_tracking_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_view3d_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_world_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/intern/dna_genfile.c
    branches/soc-2011-cucumber/source/blender/makesdna/intern/makesdna.c
    branches/soc-2011-cucumber/source/blender/makesrna/RNA_access.h
    branches/soc-2011-cucumber/source/blender/makesrna/RNA_define.h
    branches/soc-2011-cucumber/source/blender/makesrna/RNA_enum_types.h
    branches/soc-2011-cucumber/source/blender/makesrna/RNA_types.h
    branches/soc-2011-cucumber/source/blender/makesrna/SConscript
    branches/soc-2011-cucumber/source/blender/makesrna/intern/CMakeLists.txt
    branches/soc-2011-cucumber/source/blender/makesrna/intern/makesrna.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_access.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_animviz.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_armature.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_brush.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_camera.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_context.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_controller.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_define.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_fcurve.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_fluidsim.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_group.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_image.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_image_api.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_internal_types.h
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_key.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_lamp.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_lattice.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_material.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_meta.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_movieclip.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_nodetree_types.h
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_object.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_object_api.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_pose.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_property.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_rna.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_scene_api.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_sensor.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_space.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_speaker.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_text.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_text_api.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_texture_api.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_tracking.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_ui.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_ui_api.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_world.c
    branches/soc-2011-cucumber/source/blender/modifiers/CMakeLists.txt
    branches/soc-2011-cucumber/source/blender/modifiers/MOD_modifiertypes.h
    branches/soc-2011-cucumber/source/blender/modifiers/SConscript
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_armature.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_array.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_boolean.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_boolean_util.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_build.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_cast.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_curve.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_displace.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_edgesplit.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_fluidsim_util.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_hook.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_lattice.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_mask.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_meshdeform.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_mirror.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_none.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_screw.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_smooth.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_solidify.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_util.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_util.h
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_uvproject.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_warp.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_wave.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_weightvg_util.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_weightvgedit.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_weightvgmix.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_weightvgproximity.c
    branches/soc-2011-cucumber/source/blender/nodes/CMakeLists.txt
    branches/soc-2011-cucumber/source/blender/nodes/NOD_composite.h
    branches/soc-2011-cucumber/source/blender/nodes/NOD_shader.h
    branches/soc-2011-cucumber/source/blender/nodes/NOD_socket.h
    branches/soc-2011-cucumber/source/blender/nodes/NOD_texture.h
    branches/soc-2011-cucumber/source/blender/nodes/composite/node_composite_tree.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/node_composite_util.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/node_composite_util.h
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_blur.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_brightness.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_common.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_composite.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_crop.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_curves.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_defocus.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_dilate.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_displace.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_filter.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_flip.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_gamma.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_glare.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_idMask.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_image.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_invert.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_lensdist.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_levels.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_mapUV.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_mapValue.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_math.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_movieclip.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_normal.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_normalize.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_outputFile.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_premulkey.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_rgb.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_rotate.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_scale.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_setalpha.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_texture.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_tonemap.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_transform.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_translate.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_value.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_viewer.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_zcombine.c
    branches/soc-2011-cucumber/source/blender/nodes/intern/node_common.c
    branches/soc-2011-cucumber/source/blender/nodes/intern/node_exec.c
    branches/soc-2011-cucumber/source/blender/nodes/intern/node_util.c
    branches/soc-2011-cucumber/source/blender/nodes/intern/node_util.h
    branches/soc-2011-cucumber/source/blender/nodes/shader/node_shader_tree.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/node_shader_util.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/node_shader_util.h
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_add_shader.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_attribute.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_background.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_camera.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_common.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_curves.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_dynamic.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_emission.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_fresnel.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_geom.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_geometry.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_holdout.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_invert.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_layer_weight.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_light_path.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_mapping.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_material.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_math.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_mix_shader.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_normal.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_output.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_output_lamp.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_output_material.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_output_world.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_rgb.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_squeeze.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_tex_image.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_texture.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_value.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_vectMath.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_volume_isotropic.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_volume_transparent.c
    branches/soc-2011-cucumber/source/blender/nodes/texture/node_texture_tree.c
    branches/soc-2011-cucumber/source/blender/nodes/texture/node_texture_util.c
    branches/soc-2011-cucumber/source/blender/nodes/texture/node_texture_util.h
    branches/soc-2011-cucumber/source/blender/nodes/texture/nodes/node_texture_at.c
    branches/soc-2011-cucumber/source/blender/nodes/texture/nodes/node_texture_bricks.c
    branches/soc-2011-cucumber/source/blender/nodes/texture/nodes/node_texture_checker.c
    branches/soc-2011-cucumber/source/blender/nodes/texture/nodes/node_texture_common.c
    branches/soc-2011-cucumber/source/blender/nodes/texture/nodes/node_texture_compose.c
    branches/soc-2011-cucumber/source/blender/nodes/texture/nodes/node_texture_coord.c
    branches/soc-2011-cucumber/source/blender/nodes/texture/nodes/node_texture_curves.c
    branches/soc-2011-cucumber/source/blender/nodes/texture/nodes/node_texture_decompose.c
    branches/soc-2011-cucumber/source/blender/nodes/texture/nodes/node_texture_distance.c
    branches/soc-2011-cucumber/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
    branches/soc-2011-cucumber/source/blender/nodes/texture/nodes/node_texture_image.c
    branches/soc-2011-cucumber/source/blender/nodes/texture/nodes/node_texture_invert.c
    branches/soc-2011-cucumber/source/blender/nodes/texture/nodes/node_texture_math.c
    branches/soc-2011-cucumber/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
    branches/soc-2011-cucumber/source/blender/nodes/texture/nodes/node_texture_output.c
    branches/soc-2011-cucumber/source/blender/nodes/texture/nodes/node_texture_proc.c
    branches/soc-2011-cucumber/source/blender/nodes/texture/nodes/node_texture_rotate.c
    branches/soc-2011-cucumber/source/blender/nodes/texture/nodes/node_texture_scale.c
    branches/soc-2011-cucumber/source/blender/nodes/texture/nodes/node_texture_texture.c
    branches/soc-2011-cucumber/source/blender/nodes/texture/nodes/node_texture_translate.c
    branches/soc-2011-cucumber/source/blender/nodes/texture/nodes/node_texture_valToNor.c
    branches/soc-2011-cucumber/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
    branches/soc-2011-cucumber/source/blender/nodes/texture/nodes/node_texture_viewer.c
    branches/soc-2011-cucumber/source/blender/python/BPY_extern.h
    branches/soc-2011-cucumber/source/blender/python/generic/CMakeLists.txt
    branches/soc-2011-cucumber/source/blender/python/generic/bgl.c
    branches/soc-2011-cucumber/source/blender/python/generic/py_capi_utils.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_app.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_app_handlers.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_driver.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_driver.h
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_interface.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_library.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_operator.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_props.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_rna.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_rna_anim.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_rna_array.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_rna_callback.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_traceback.c
    branches/soc-2011-cucumber/source/blender/python/intern/gpu.c
    branches/soc-2011-cucumber/source/blender/python/intern/gpu.h
    branches/soc-2011-cucumber/source/blender/python/mathutils/CMakeLists.txt
    branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils.c
    branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils.h
    branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_Color.c
    branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_Color.h
    branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_Euler.c
    branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_Euler.h
    branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_Matrix.c
    branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_Matrix.h
    branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_Quaternion.c
    branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_Quaternion.h
    branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_Vector.c
    branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_Vector.h
    branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_geometry.c
    branches/soc-2011-cucumber/source/blender/quicktime/apple/qtkit_export.m
    branches/soc-2011-cucumber/source/blender/quicktime/apple/qtkit_import.m
    branches/soc-2011-cucumber/source/blender/quicktime/apple/quicktime_export.c
    branches/soc-2011-cucumber/source/blender/quicktime/apple/quicktime_import.c
    branches/soc-2011-cucumber/source/blender/render/CMakeLists.txt
    branches/soc-2011-cucumber/source/blender/render/extern/include/RE_engine.h
    branches/soc-2011-cucumber/source/blender/render/extern/include/RE_pipeline.h
    branches/soc-2011-cucumber/source/blender/render/extern/include/RE_render_ext.h
    branches/soc-2011-cucumber/source/blender/render/extern/include/RE_shader_ext.h
    branches/soc-2011-cucumber/source/blender/render/intern/include/pointdensity.h
    branches/soc-2011-cucumber/source/blender/render/intern/include/render_types.h
    branches/soc-2011-cucumber/source/blender/render/intern/include/texture.h
    branches/soc-2011-cucumber/source/blender/render/intern/include/voxeldata.h
    branches/soc-2011-cucumber/source/blender/render/intern/source/convertblender.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/envmap.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/external_engine.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/imagetexture.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/initrender.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/occlusion.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/pipeline.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/pixelshading.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/pointdensity.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/rayshade.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/render_texture.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/rendercore.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/shadbuf.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/shadeinput.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/shadeoutput.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/strand.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/volume_precache.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/volumetric.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/voxeldata.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/zbuf.c
    branches/soc-2011-cucumber/source/blender/windowmanager/CMakeLists.txt
    branches/soc-2011-cucumber/source/blender/windowmanager/WM_api.h
    branches/soc-2011-cucumber/source/blender/windowmanager/WM_keymap.h
    branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm.c
    branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_apple.c
    branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_draw.c
    branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_gesture.c
    branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_jobs.c
    branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_keymap.c
    branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2011-cucumber/source/blenderplayer/CMakeLists.txt
    branches/soc-2011-cucumber/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2011-cucumber/source/creator/CMakeLists.txt
    branches/soc-2011-cucumber/source/creator/creator.c
    branches/soc-2011-cucumber/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/soc-2011-cucumber/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/soc-2011-cucumber/source/gameengine/Converter/BL_ArmatureChannel.cpp
    branches/soc-2011-cucumber/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/soc-2011-cucumber/source/gameengine/Converter/BL_SkinDeformer.cpp
    branches/soc-2011-cucumber/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2011-cucumber/source/gameengine/Expressions/IntValue.h
    branches/soc-2011-cucumber/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/soc-2011-cucumber/source/gameengine/GameLogic/SCA_MouseSensor.h
    branches/soc-2011-cucumber/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
    branches/soc-2011-cucumber/source/gameengine/GamePlayer/common/bmfont.cpp
    branches/soc-2011-cucumber/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/soc-2011-cucumber/source/gameengine/GamePlayer/xembed/CMakeLists.txt
    branches/soc-2011-cucumber/source/gameengine/Ketsji/BL_Action.cpp
    branches/soc-2011-cucumber/source/gameengine/Ketsji/BL_BlenderShader.cpp
    branches/soc-2011-cucumber/source/gameengine/Ketsji/BL_Shader.cpp
    branches/soc-2011-cucumber/source/gameengine/Ketsji/BL_Texture.cpp
    branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_Dome.cpp
    branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_IpoActuator.h
    branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_MouseFocusSensor.h
    branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_NearSensor.h
    branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_ObjectActuator.cpp
    branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
    branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_ObstacleSimulation.h
    branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_ParentActuator.cpp
    branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_ParentActuator.h
    branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_PyMath.cpp
    branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_SteeringActuator.cpp
    branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_SteeringActuator.h
    branches/soc-2011-cucumber/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/soc-2011-cucumber/source/gameengine/Rasterizer/CMakeLists.txt
    branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
    branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_MeshObject.cpp
    branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp
    branches/soc-2011-cucumber/source/gameengine/VideoTexture/CMakeLists.txt
    branches/soc-2011-cucumber/source/gameengine/VideoTexture/Texture.cpp
    branches/soc-2011-cucumber/source/gameengine/VideoTexture/Texture.h
    branches/soc-2011-cucumber/source/tests/pep8.py

Added Paths:
-----------
    branches/soc-2011-cucumber/extern/libmv/libmv/simple_pipeline/callbacks.cc
    branches/soc-2011-cucumber/extern/libmv/libmv/simple_pipeline/callbacks.h
    branches/soc-2011-cucumber/extern/libmv/libmv/tracking/brute_region_tracker.cc
    branches/soc-2011-cucumber/extern/libmv/libmv/tracking/brute_region_tracker.h
    branches/soc-2011-cucumber/extern/libmv/libmv/tracking/esm_region_tracker.cc
    branches/soc-2011-cucumber/extern/libmv/libmv/tracking/esm_region_tracker.h
    branches/soc-2011-cucumber/extern/libmv/libmv/tracking/hybrid_region_tracker.cc
    branches/soc-2011-cucumber/extern/libmv/libmv/tracking/hybrid_region_tracker.h
    branches/soc-2011-cucumber/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc
    branches/soc-2011-cucumber/extern/libmv/libmv/tracking/lmicklt_region_tracker.h
    branches/soc-2011-cucumber/extern/libmv/third_party/glog/src/config_freebsd.h
    branches/soc-2011-cucumber/intern/cycles/kernel/SConscript
    branches/soc-2011-cucumber/intern/cycles/kernel/kernel_optimized.cpp
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/bsdf_oren_nayar.cpp
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_camera.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_gamma.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_hsv.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_invert.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_normal.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_sepcomb_rgb.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/svm/bsdf_oren_nayar.h
    branches/soc-2011-cucumber/intern/cycles/kernel/svm/svm_camera.h
    branches/soc-2011-cucumber/intern/cycles/kernel/svm/svm_gamma.h
    branches/soc-2011-cucumber/intern/cycles/kernel/svm/svm_hsv.h
    branches/soc-2011-cucumber/intern/cycles/kernel/svm/svm_invert.h
    branches/soc-2011-cucumber/intern/cycles/kernel/svm/svm_normal.h
    branches/soc-2011-cucumber/intern/cycles/kernel/svm/svm_sepcomb_rgb.h
    branches/soc-2011-cucumber/intern/cycles/util/util_opencl.cpp
    branches/soc-2011-cucumber/release/scripts/presets/camera/Nikon_D3S.py
    branches/soc-2011-cucumber/release/scripts/presets/camera/Sony_A55.py
    branches/soc-2011-cucumber/release/scripts/presets/tracking_camera/Sony_A55.py
    branches/soc-2011-cucumber/release/scripts/presets/tracking_settings/
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_dynamicpaint.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_ocean.h
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/dynamicpaint.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/editderivedmesh.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/ocean.c
    branches/soc-2011-cucumber/source/blender/editors/physics/dynamicpaint_ops.c
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_defs.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_dynamicpaint_types.h
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_dynamicpaint.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_dynamicpaint.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_ocean.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_gamma.c
    branches/soc-2011-cucumber/source/blender/python/generic/idprop_py_api.c
    branches/soc-2011-cucumber/source/blender/python/generic/idprop_py_api.h
    branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_noise.c
    branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_noise.h
    branches/soc-2011-cucumber/source/blender/render/intern/include/texture_ocean.h
    branches/soc-2011-cucumber/source/blender/render/intern/source/texture_ocean.c

Removed Paths:
-------------
    branches/soc-2011-cucumber/doc/python_api/epy/testbgl.py
    branches/soc-2011-cucumber/extern/Eigen2/
    branches/soc-2011-cucumber/intern/cycles/blender/addon/xml.py
    branches/soc-2011-cucumber/intern/cycles/util/util_opencl.c
    branches/soc-2011-cucumber/release/scripts/presets/camera/Nikon_D35.py
    branches/soc-2011-cucumber/source/blender/python/generic/IDProp.c
    branches/soc-2011-cucumber/source/blender/python/generic/IDProp.h
    branches/soc-2011-cucumber/source/blender/python/generic/noise_py_api.c
    branches/soc-2011-cucumber/source/blender/python/generic/noise_py_api.h

Property Changed:
----------------
    branches/soc-2011-cucumber/
    branches/soc-2011-cucumber/build_files/
    branches/soc-2011-cucumber/doc/
    branches/soc-2011-cucumber/extern/
    branches/soc-2011-cucumber/extern/libmv/third_party/ssba/README.libmv
    branches/soc-2011-cucumber/intern/
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_add_closure.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_attribute.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_background.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_blend_texture.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_blend_weight.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_bump.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_clouds_texture.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_convert_from_color.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_convert_from_float.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_convert_from_normal.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_convert_from_point.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_convert_from_vector.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_diffuse_bsdf.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_distorted_noise_texture.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_emission.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_environment_texture.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_fresnel.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_geometry.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_glossy_bsdf.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_holdout.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_image_texture.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_light_path.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_magic_texture.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_mapping.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_marble_texture.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_math.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_mix.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_mix_closure.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_musgrave_texture.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_noise_texture.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_output_displacement.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_output_surface.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_output_volume.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_sky_texture.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_stucci_texture.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_texture_coordinate.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_translucent_bsdf.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_transparent_bsdf.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_value.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_vector_math.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_velvet_bsdf.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_voronoi_texture.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_ward_bsdf.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_wood_texture.osl
    branches/soc-2011-cucumber/intern/cycles/util/util_opencl.h
    branches/soc-2011-cucumber/release/
    branches/soc-2011-cucumber/release/scripts/
    branches/soc-2011-cucumber/source/blender/
    branches/soc-2011-cucumber/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-cucumber
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:36829-40545,40632-41712
/trunk/blender/source/darwin:41227-41228
   + /branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:36829-40545,40632-42742
/trunk/blender/source/darwin:41227-41228

Modified: branches/soc-2011-cucumber/CMakeLists.txt
===================================================================
--- branches/soc-2011-cucumber/CMakeLists.txt	2011-12-19 23:52:17 UTC (rev 42742)
+++ branches/soc-2011-cucumber/CMakeLists.txt	2011-12-20 00:42:05 UTC (rev 42743)
@@ -171,6 +171,7 @@
 option(WITH_MOD_BOOLEAN        	"Enable Boolean Modifier" ON)
 option(WITH_MOD_CLOTH_ELTOPO   	"Enable Experemental cloth solver" OFF)
 mark_as_advanced(WITH_MOD_CLOTH_ELTOPO)
+option(WITH_MOD_OCEANSIM        "Enable Ocean Modifier" OFF)
 
 # Image format support
 option(WITH_IMAGE_OPENEXR       "Enable OpenEXR Support (http://www.openexr.com)" ON)
@@ -214,8 +215,11 @@
 option(WITH_PYTHON_INSTALL       "Copy system python into the blender install folder" ON)
 
 # Cycles
-option(WITH_CYCLES			"Enable Cycles Render Engine" ON)
-OPTION(WITH_CYCLES_TEST		"Build cycles test application" OFF)
+option(WITH_CYCLES					"Enable cycles Render Engine" ON)
+option(WITH_CYCLES_TEST				"Build cycles test application" 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")
+mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
 
 # disable for now, but plan to support on all platforms eventually
 option(WITH_MEM_JEMALLOC   "Enable malloc replacement (http://www.canonware.com/jemalloc)" OFF)
@@ -283,6 +287,10 @@
 						"line if youre a developer who wants to add support.")
 endif()
 
+if(NOT WITH_FFTW3 AND WITH_MOD_OCEANSIM)
+	message(FATAL_ERROR "WITH_MOD_OCEANSIM requires WITH_FFTW3 to be ON")
+endif()
+
 # may as well build python module without a UI
 if(WITH_PYTHON_MODULE)
 	set(WITH_HEADLESS ON)
@@ -359,6 +367,19 @@
 		set(CMAKE_LIBRARY_PATH "/usr/lib/x86_64-linux-gnu;${CMAKE_LIBRARY_PATH}")
 	endif()
 
+	# set lib directory if it exists
+	if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+		if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+			set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/linux64)
+		else()
+			set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/linux)
+		endif()
+
+		if(NOT EXISTS ${LIBDIR})
+			unset(LIBDIR)
+		endif()
+	endif()
+
 	find_package(JPEG REQUIRED)
 	find_package(PNG REQUIRED)
 	find_package(ZLIB REQUIRED)
@@ -433,10 +454,17 @@
 	endif()
 
 	if(WITH_CODEC_FFMPEG)
-		set(FFMPEG /usr CACHE PATH "FFMPEG Directory")
+		# use lib dir if available and nothing else specified
+		if(LIBDIR AND NOT FFMPEG)
+			set(FFMPEG ${LIBDIR}/ffmpeg CACHE PATH "FFMPEG Directory")
+			set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale dirac_encoder mp3lame ogg orc-0.4 schroedinger-1.0 theora theoraenc theoradec vorbis vorbisenc vpx x264 xvidcore faad asound CACHE STRING "FFMPEG Libraries")
+		else()
+			set(FFMPEG /usr CACHE PATH "FFMPEG Directory")
+			set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
+		endif()
+
 		mark_as_advanced(FFMPEG)
 		set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
-		set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
 		mark_as_advanced(FFMPEG_LIBRARIES)
 		set(FFMPEG_LIBPATH ${FFMPEG}/lib)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")
@@ -502,11 +530,17 @@
 	endif()
 
 	if(WITH_BOOST)
-		
 		# uses in build instructions to override include and library variables
 		if(NOT BOOST_CUSTOM)
-			set(Boost_USE_MULTITHREADED ON)
+			# use lib dir if available and nothing else specified
+			if(LIBDIR AND NOT BOOST_ROOT)
+				set(BOOST_ROOT ${LIBDIR}/boost)
+				set(Boost_USE_MULTITHREADED OFF)
+			else()
+				set(Boost_USE_MULTITHREADED ON)
+			endif()
 			find_package(Boost 1.34 COMPONENTS filesystem regex system thread)
+			mark_as_advanced(Boost_DIR)  # why doesnt boost do this?
 		endif()
 
 		set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS})
@@ -516,6 +550,11 @@
 	endif()
 
 	if(WITH_OPENIMAGEIO)
+		# use lib dir if available and nothing else specified
+		if(LIBDIR AND NOT OPENIMAGEIO_ROOT_DIR)
+			set(OPENIMAGEIO_ROOT_DIR ${LIBDIR}/oiio)
+		endif()
+
 		find_package(OpenImageIO)
 
 		set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARY} ${OPENEXR_LIBRARIES} ${ZLIB_LIBRARIES} ${BOOST_LIBRARIES})
@@ -610,10 +649,6 @@
 		set(ICONV_LIBPATH ${ICONV}/lib)
 	endif()
 
-	set(PNG "${LIBDIR}/png")
-	set(PNG_INCLUDE_DIR "${PNG}/include")
-	set(PNG_LIBPATH ${PNG}/lib) # not cmake defined
-
 	set(JPEG "${LIBDIR}/jpeg")
 	set(JPEG_INCLUDE_DIR "${JPEG}/include")
 	set(JPEG_LIBPATH ${JPEG}/lib) # not cmake defined
@@ -688,12 +723,12 @@
 			set(GETTEXT_LIBRARIES gnu_gettext)
 		endif()
 
-		if(CMAKE_CL_64)
-			set(PNG_LIBRARIES libpng)
-		else()
-			set(PNG_LIBRARIES libpng_st)
-		endif()
+		set(PNG_LIBRARIES libpng)
 		set(JPEG_LIBRARIES libjpeg)
+		
+		set(PNG "${LIBDIR}/png")
+		set(PNG_INCLUDE_DIR "${PNG}/include")
+		set(PNG_LIBPATH ${PNG}/lib) # not cmake defined
 
 		set(ZLIB_INCLUDE_DIRS ${LIBDIR}/zlib/include)
 		if(CMAKE_CL_64)
@@ -818,14 +853,23 @@
 		if(WITH_BOOST)
 			set(BOOST ${LIBDIR}/boost)
 			set(BOOST_INCLUDE_DIR ${BOOST}/include)
-			set(BOOST_POSTFIX "vc90-mt-s-1_47.lib")
-			set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_47.lib")
+			if(MSVC10)
+				set(BOOST_POSTFIX "vc100-mt-s-1_47.lib")
+				set(BOOST_DEBUG_POSTFIX "vc100-mt-sgd-1_47.lib")
+			else()
+				set(BOOST_POSTFIX "vc90-mt-s-1_47.lib")
+				set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_47.lib")					
+			endif()
 			set(BOOST_LIBRARIES
-				optimized libboost_date_time-${BOOST_POSTFIX} libboost_filesystem-${BOOST_POSTFIX}
-				libboost_regex-${BOOST_POSTFIX} libboost_system-${BOOST_POSTFIX} libboost_thread-${BOOST_POSTFIX}
-				debug libboost_date_time-${BOOST_DEBUG_POSTFIX} libboost_filesystem-${BOOST_DEBUG_POSTFIX}
-				libboost_regex-${BOOST_DEBUG_POSTFIX} libboost_system-${BOOST_DEBUG_POSTFIX} libboost_thread-${BOOST_DEBUG_POSTFIX})
-			set(BOOST_LIBPATH ${BOOST}/lib)
+				optimized libboost_date_time-${BOOST_POSTFIX} optimized libboost_filesystem-${BOOST_POSTFIX}
+				optimized libboost_regex-${BOOST_POSTFIX} optimized libboost_system-${BOOST_POSTFIX} optimized libboost_thread-${BOOST_POSTFIX}
+				debug libboost_date_time-${BOOST_DEBUG_POSTFIX} debug libboost_filesystem-${BOOST_DEBUG_POSTFIX}
+				debug libboost_regex-${BOOST_DEBUG_POSTFIX} debug libboost_system-${BOOST_DEBUG_POSTFIX} debug libboost_thread-${BOOST_DEBUG_POSTFIX})
+			if(MSVC10)
+				set(BOOST_LIBPATH ${BOOST}/lib/vc_10)
+			else()
+				set(BOOST_LIBPATH ${BOOST}/lib)
+			endif()
 			set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")
 		endif()
 			
@@ -865,6 +909,10 @@
 			set(GETTEXT_LIBPATH ${GETTEXT}/lib)
 			set(GETTEXT_LIBRARIES intl)
 		endif()
+		
+		set(PNG "${LIBDIR}/gcc/png")
+		set(PNG_INCLUDE_DIR "${PNG}/include")
+		set(PNG_LIBPATH ${PNG}/lib) # not cmake defined
 
 		set(JPEG_LIBRARIES libjpeg)
 		set(PNG_LIBRARIES png)
@@ -1529,6 +1577,7 @@
 	info_cfg_option(WITH_MOD_BOOLEAN)
 	info_cfg_option(WITH_MOD_DECIMATE)
 	info_cfg_option(WITH_MOD_FLUID)
+	info_cfg_option(WITH_MOD_OCEANSIM)
 
 	info_cfg_text("")
 

Modified: branches/soc-2011-cucumber/GNUmakefile
===================================================================
--- branches/soc-2011-cucumber/GNUmakefile	2011-12-19 23:52:17 UTC (rev 42742)
+++ branches/soc-2011-cucumber/GNUmakefile	2011-12-20 00:42:05 UTC (rev 42743)
@@ -34,8 +34,11 @@
 # Source and Build DIR's
 BLENDER_DIR:=$(shell pwd -P)
 BUILD_TYPE:=Release
-BUILD_CMAKE_ARGS:=
 
+ifndef BUILD_CMAKE_ARGS
+	BUILD_CMAKE_ARGS:=
+endif
+
 ifndef BUILD_DIR
 	BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS_NCASE)
 endif
@@ -90,6 +93,17 @@
 
 
 # -----------------------------------------------------------------------------
+# Tool for 'make config'
+
+# X11 spesific
+ifdef DISPLAY
+	CMAKE_CONFIG_TOOL = cmake-gui
+else 
+	CMAKE_CONFIG_TOOL = ccmake
+endif
+
+
+# -----------------------------------------------------------------------------
 # Build Blender
 all:
 	@echo
@@ -112,8 +126,15 @@
 headless: all
 bpy: all
 
+
 # -----------------------------------------------------------------------------
-# Helo for build targets
+# Configuration (save some cd'ing around)
+config:
+	$(CMAKE_CONFIG_TOOL) $(BUILD_DIR)
+
+
+# -----------------------------------------------------------------------------
+# Help for build targets
 help:
 	@echo ""
 	@echo "Convenience targets provided for building blender, (multiple at once can be used)"
@@ -122,7 +143,10 @@
 	@echo "  * headless  - build without an interface (renderfarm or server automation)"
 	@echo "  * bpy       - build as a python module which can be loaded from python directly"
 	@echo ""
+	@echo "  * config    - run cmake configuration tool to set build options"
+	@echo ""
 	@echo "  Note, passing the argument 'BUILD_DIR=path' when calling make will override the default build dir."
+	@echo "  Note, passing the argument 'BUILD_CMAKE_ARGS=args' lets you add cmake arguments."
 	@echo ""
 	@echo ""
 	@echo "Project Files for IDE's"

Modified: branches/soc-2011-cucumber/SConstruct
===================================================================
--- branches/soc-2011-cucumber/SConstruct	2011-12-19 23:52:17 UTC (rev 42742)
+++ branches/soc-2011-cucumber/SConstruct	2011-12-20 00:42:05 UTC (rev 42743)
@@ -70,6 +70,7 @@
 B = Blender
 
 VERSION = btools.VERSION # This is used in creating the local config directories
+VERSION_RELEASE_CYCLE = btools.VERSION_RELEASE_CYCLE
 
 ### globals ###
 platform = sys.platform
@@ -118,6 +119,12 @@
 if tempbitness in (32, 64): # only set if 32 or 64 has been given
     bitness = int(tempbitness)
 
+if bitness:
+    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)
@@ -162,7 +169,7 @@
 
 if sys.platform=='win32':
     if env['CC'] in ['cl', 'cl.exe']:
-         platform = 'win64-vc' if bitness == 64 else 'win32-vc'
+        platform = 'win64-vc' if bitness == 64 else 'win32-vc'
     elif env['CC'] in ['gcc']:
         platform = 'win32-mingw'
 
@@ -254,6 +261,7 @@
     target_env_defs['WITH_BF_BINRELOC'] = False

@@ Diff output truncated at 10240 characters. @@