[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54570] branches/soc-2011-tomato: Merging r53628 through r54569 from trunk into soc-2011-tomato

Sergey Sharybin sergey.vfx at gmail.com
Fri Feb 15 07:33:29 CET 2013


Revision: 54570
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54570
Author:   nazgul
Date:     2013-02-15 06:33:27 +0000 (Fri, 15 Feb 2013)
Log Message:
-----------
Merging r53628 through r54569 from trunk into soc-2011-tomato

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

Modified Paths:
--------------
    branches/soc-2011-tomato/CMakeLists.txt
    branches/soc-2011-tomato/SConstruct
    branches/soc-2011-tomato/build_files/buildbot/config/user-config-glibc211-i686.py
    branches/soc-2011-tomato/build_files/buildbot/config/user-config-glibc211-x86_64.py
    branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-glibc211-i686.py
    branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
    branches/soc-2011-tomato/build_files/buildbot/master.cfg
    branches/soc-2011-tomato/build_files/buildbot/slave_compile.py
    branches/soc-2011-tomato/build_files/buildbot/slave_pack.py
    branches/soc-2011-tomato/build_files/buildbot/slave_rsync.py
    branches/soc-2011-tomato/build_files/cmake/cmake_consistency_check_config.py
    branches/soc-2011-tomato/build_files/cmake/cmake_netbeans_project.py
    branches/soc-2011-tomato/build_files/cmake/cmake_qtcreator_project.py
    branches/soc-2011-tomato/build_files/cmake/cmake_static_check_clang_array.py
    branches/soc-2011-tomato/build_files/cmake/cmake_static_check_cppcheck.py
    branches/soc-2011-tomato/build_files/cmake/cmake_static_check_smatch.py
    branches/soc-2011-tomato/build_files/cmake/cmake_static_check_sparse.py
    branches/soc-2011-tomato/build_files/cmake/cmake_static_check_splint.py
    branches/soc-2011-tomato/build_files/cmake/config/blender_headless.cmake
    branches/soc-2011-tomato/build_files/cmake/config/blender_lite.cmake
    branches/soc-2011-tomato/build_files/cmake/config/bpy_module.cmake
    branches/soc-2011-tomato/build_files/cmake/project_info.py
    branches/soc-2011-tomato/build_files/cmake/project_source_info.py
    branches/soc-2011-tomato/build_files/scons/config/Modules/FindPython.py
    branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
    branches/soc-2011-tomato/build_files/scons/config/linux-config.py
    branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py
    branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py
    branches/soc-2011-tomato/build_files/scons/tools/Blender.py
    branches/soc-2011-tomato/build_files/scons/tools/btools.py
    branches/soc-2011-tomato/doc/manpage/blender.1
    branches/soc-2011-tomato/doc/python_api/examples/bpy.props.5.py
    branches/soc-2011-tomato/doc/python_api/examples/bpy.types.AddonPreferences.1.py
    branches/soc-2011-tomato/doc/python_api/examples/bpy.types.UIList.py
    branches/soc-2011-tomato/doc/python_api/rst/bge.events.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge.types.rst
    branches/soc-2011-tomato/doc/python_api/rst/info_tutorial_addon.rst
    branches/soc-2011-tomato/doc/python_api/rst_from_bmesh_opdefines.py
    branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py
    branches/soc-2011-tomato/extern/bullet2/CMakeLists.txt
    branches/soc-2011-tomato/extern/carve/lib/intersect_face_division.cpp
    branches/soc-2011-tomato/intern/CMakeLists.txt
    branches/soc-2011-tomato/intern/SConscript
    branches/soc-2011-tomato/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
    branches/soc-2011-tomato/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
    branches/soc-2011-tomato/intern/bsp/intern/CSG_BooleanOps.cpp
    branches/soc-2011-tomato/intern/cycles/CMakeLists.txt
    branches/soc-2011-tomato/intern/cycles/SConscript
    branches/soc-2011-tomato/intern/cycles/app/cycles_xml.cpp
    branches/soc-2011-tomato/intern/cycles/blender/addon/__init__.py
    branches/soc-2011-tomato/intern/cycles/blender/addon/engine.py
    branches/soc-2011-tomato/intern/cycles/blender/addon/osl.py
    branches/soc-2011-tomato/intern/cycles/blender/addon/properties.py
    branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py
    branches/soc-2011-tomato/intern/cycles/blender/blender_curves.cpp
    branches/soc-2011-tomato/intern/cycles/blender/blender_mesh.cpp
    branches/soc-2011-tomato/intern/cycles/blender/blender_object.cpp
    branches/soc-2011-tomato/intern/cycles/blender/blender_python.cpp
    branches/soc-2011-tomato/intern/cycles/blender/blender_session.cpp
    branches/soc-2011-tomato/intern/cycles/blender/blender_session.h
    branches/soc-2011-tomato/intern/cycles/blender/blender_shader.cpp
    branches/soc-2011-tomato/intern/cycles/blender/blender_sync.cpp
    branches/soc-2011-tomato/intern/cycles/blender/blender_util.h
    branches/soc-2011-tomato/intern/cycles/bvh/bvh.cpp
    branches/soc-2011-tomato/intern/cycles/bvh/bvh_build.cpp
    branches/soc-2011-tomato/intern/cycles/device/CMakeLists.txt
    branches/soc-2011-tomato/intern/cycles/device/device_cpu.cpp
    branches/soc-2011-tomato/intern/cycles/device/device_cuda.cpp
    branches/soc-2011-tomato/intern/cycles/device/device_opencl.cpp
    branches/soc-2011-tomato/intern/cycles/kernel/CMakeLists.txt
    branches/soc-2011-tomato/intern/cycles/kernel/kernel.h
    branches/soc-2011-tomato/intern/cycles/kernel/kernel_accumulate.h
    branches/soc-2011-tomato/intern/cycles/kernel/kernel_bvh.h
    branches/soc-2011-tomato/intern/cycles/kernel/kernel_camera.h
    branches/soc-2011-tomato/intern/cycles/kernel/kernel_emission.h
    branches/soc-2011-tomato/intern/cycles/kernel/kernel_light.h
    branches/soc-2011-tomato/intern/cycles/kernel/kernel_passes.h
    branches/soc-2011-tomato/intern/cycles/kernel/kernel_path.h
    branches/soc-2011-tomato/intern/cycles/kernel/kernel_primitive.h
    branches/soc-2011-tomato/intern/cycles/kernel/kernel_shader.h
    branches/soc-2011-tomato/intern/cycles/kernel/kernel_types.h
    branches/soc-2011-tomato/intern/cycles/kernel/osl/SConscript
    branches/soc-2011-tomato/intern/cycles/kernel/osl/osl_services.cpp
    branches/soc-2011-tomato/intern/cycles/kernel/osl/osl_shader.cpp
    branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_musgrave_texture.osl
    branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_normal_map.osl
    branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_texture.h
    branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_noise.h
    branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_tex_coord.h
    branches/soc-2011-tomato/intern/cycles/render/buffers.cpp
    branches/soc-2011-tomato/intern/cycles/render/camera.cpp
    branches/soc-2011-tomato/intern/cycles/render/camera.h
    branches/soc-2011-tomato/intern/cycles/render/curves.cpp
    branches/soc-2011-tomato/intern/cycles/render/curves.h
    branches/soc-2011-tomato/intern/cycles/render/graph.cpp
    branches/soc-2011-tomato/intern/cycles/render/image.cpp
    branches/soc-2011-tomato/intern/cycles/render/image.h
    branches/soc-2011-tomato/intern/cycles/render/light.cpp
    branches/soc-2011-tomato/intern/cycles/render/light.h
    branches/soc-2011-tomato/intern/cycles/render/mesh.cpp
    branches/soc-2011-tomato/intern/cycles/render/mesh.h
    branches/soc-2011-tomato/intern/cycles/render/nodes.cpp
    branches/soc-2011-tomato/intern/cycles/render/nodes.h
    branches/soc-2011-tomato/intern/cycles/render/object.cpp
    branches/soc-2011-tomato/intern/cycles/render/osl.cpp
    branches/soc-2011-tomato/intern/cycles/render/osl.h
    branches/soc-2011-tomato/intern/cycles/render/scene.cpp
    branches/soc-2011-tomato/intern/cycles/render/scene.h
    branches/soc-2011-tomato/intern/cycles/render/session.cpp
    branches/soc-2011-tomato/intern/cycles/render/session.h
    branches/soc-2011-tomato/intern/cycles/render/shader.h
    branches/soc-2011-tomato/intern/cycles/render/svm.cpp
    branches/soc-2011-tomato/intern/cycles/render/svm.h
    branches/soc-2011-tomato/intern/cycles/render/tile.cpp
    branches/soc-2011-tomato/intern/cycles/render/tile.h
    branches/soc-2011-tomato/intern/cycles/util/util_boundbox.h
    branches/soc-2011-tomato/intern/cycles/util/util_cache.h
    branches/soc-2011-tomato/intern/cycles/util/util_cuda.cpp
    branches/soc-2011-tomato/intern/cycles/util/util_cuda.h
    branches/soc-2011-tomato/intern/cycles/util/util_math.h
    branches/soc-2011-tomato/intern/cycles/util/util_system.cpp
    branches/soc-2011-tomato/intern/cycles/util/util_system.h
    branches/soc-2011-tomato/intern/cycles/util/util_task.cpp
    branches/soc-2011-tomato/intern/cycles/util/util_task.h
    branches/soc-2011-tomato/intern/dualcon/intern/MemoryAllocator.h
    branches/soc-2011-tomato/intern/ffmpeg/ffmpeg_compat.h
    branches/soc-2011-tomato/intern/ghost/CMakeLists.txt
    branches/soc-2011-tomato/intern/ghost/GHOST_C-api.h
    branches/soc-2011-tomato/intern/ghost/GHOST_ISystem.h
    branches/soc-2011-tomato/intern/ghost/GHOST_IWindow.h
    branches/soc-2011-tomato/intern/ghost/GHOST_Types.h
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_C-api.cpp
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_Debug.h
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_System.cpp
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_System.h
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCarbon.cpp
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCarbon.h
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCocoa.h
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemNULL.h
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemSDL.cpp
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemSDL.h
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemWin32.h
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemX11.h
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_Window.cpp
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_Window.h
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowCarbon.cpp
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowCocoa.h
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowX11.h
    branches/soc-2011-tomato/intern/guardedalloc/intern/mallocn.c
    branches/soc-2011-tomato/intern/locale/boost_locale_wrapper.cpp
    branches/soc-2011-tomato/intern/locale/boost_locale_wrapper.h
    branches/soc-2011-tomato/intern/opencolorio/fallback_impl.cc
    branches/soc-2011-tomato/intern/opencolorio/ocio_capi.cc
    branches/soc-2011-tomato/intern/opencolorio/ocio_capi.h
    branches/soc-2011-tomato/intern/opencolorio/ocio_impl.cc
    branches/soc-2011-tomato/intern/smoke/intern/FFT_NOISE.h
    branches/soc-2011-tomato/intern/smoke/intern/FLUID_3D.cpp
    branches/soc-2011-tomato/intern/tools/credits_svn_gen.py
    branches/soc-2011-tomato/intern/tools/pydna.py
    branches/soc-2011-tomato/release/datafiles/blender_icons.svg
    branches/soc-2011-tomato/release/datafiles/blender_icons16.png
    branches/soc-2011-tomato/release/datafiles/blender_icons32.png
    branches/soc-2011-tomato/release/datafiles/startup.blend
    branches/soc-2011-tomato/release/scripts/modules/addon_utils.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/bl_process_msg.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/check_po.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/clean_po.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/import_po_from_branches.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/merge_po.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/settings.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/update_branches.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/update_languages_menu.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/update_mo.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/update_po.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/update_pot.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/update_trunk.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/utils.py
    branches/soc-2011-tomato/release/scripts/modules/bpy/__init__.py
    branches/soc-2011-tomato/release/scripts/modules/bpy/path.py
    branches/soc-2011-tomato/release/scripts/modules/bpy/utils.py
    branches/soc-2011-tomato/release/scripts/modules/bpy_extras/anim_utils.py
    branches/soc-2011-tomato/release/scripts/modules/bpy_extras/io_utils.py
    branches/soc-2011-tomato/release/scripts/modules/bpy_extras/mesh_utils.py
    branches/soc-2011-tomato/release/scripts/modules/bpy_extras/object_utils.py
    branches/soc-2011-tomato/release/scripts/modules/bpy_extras/view3d_utils.py
    branches/soc-2011-tomato/release/scripts/modules/bpy_restrict_state.py
    branches/soc-2011-tomato/release/scripts/modules/bpy_types.py
    branches/soc-2011-tomato/release/scripts/modules/console_python.py
    branches/soc-2011-tomato/release/scripts/modules/rna_prop_ui.py
    branches/soc-2011-tomato/release/scripts/presets/interface_theme/back_to_black.xml
    branches/soc-2011-tomato/release/scripts/presets/interface_theme/blender_24x.xml
    branches/soc-2011-tomato/release/scripts/presets/interface_theme/elsyiun.xml
    branches/soc-2011-tomato/release/scripts/presets/interface_theme/hexagon.xml
    branches/soc-2011-tomato/release/scripts/presets/interface_theme/ubuntu_ambiance.xml
    branches/soc-2011-tomato/release/scripts/presets/keyconfig/maya.py
    branches/soc-2011-tomato/release/scripts/presets/operator/wm.collada_export/second_life_rigged.py
    branches/soc-2011-tomato/release/scripts/presets/operator/wm.collada_export/second_life_static.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/__init__.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/node.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/object.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/object_align.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/object_quick_effects.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/object_randomize_transform.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/presets.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/uvcalc_follow_active.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/uvcalc_lightmap.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/wm.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/__init__.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_game.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_mask_common.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_material.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_object.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_object_constraint.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_paint_common.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_particle.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_common.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_smoke.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_render.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_scene.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_texture.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_console.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_dopesheet.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_image.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_info.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_text.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_time.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref_keymap.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2011-tomato/release/scripts/templates_py/ui_list.py
    branches/soc-2011-tomato/release/text/readme.html
    branches/soc-2011-tomato/source/blender/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/SConscript
    branches/soc-2011-tomato/source/blender/avi/intern/avi.c
    branches/soc-2011-tomato/source/blender/blenfont/BLF_api.h
    branches/soc-2011-tomato/source/blender/blenfont/BLF_translation.h
    branches/soc-2011-tomato/source/blender/blenfont/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/blenfont/SConscript
    branches/soc-2011-tomato/source/blender/blenfont/intern/blf_glyph.c
    branches/soc-2011-tomato/source/blender/blenfont/intern/blf_lang.c
    branches/soc-2011-tomato/source/blender/blenfont/intern/blf_translation.c
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_action.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_armature.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_brush.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_camera.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_cdderivedmesh.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_colortools.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_curve.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_customdata.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_deform.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_depsgraph.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_fcurve.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_group.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_image.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_lamp.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_lattice.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_library.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_main.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_material.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_mball.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_mesh.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_movieclip.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_node.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_object.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_packedFile.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_paint.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_particle.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_pbvh.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_pointcache.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_report.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_scene.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_screen.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_speaker.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_tessmesh.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_text.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_texture.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_world.h
    branches/soc-2011-tomato/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/blenkernel/SConscript
    branches/soc-2011-tomato/source/blender/blenkernel/intern/CCGSubSurf.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/action.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/anim.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/anim_sys.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/armature.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/blender.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/bpath.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/brush.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/bvhutils.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/camera.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/cloth.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/collision.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/colortools.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/curve.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/customdata.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/deform.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/displist.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/dynamicpaint.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/editderivedmesh.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/effect.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/fmodifier.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/font.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/group.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/icons.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/idprop.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/ipo.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/key.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/lamp.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/lattice.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/library.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/mask_rasterize.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/material.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/mball.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/modifiers_bmesh.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/multires.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/nla.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/ocean.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/packedFile.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/paint.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/particle.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/pbvh.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/pbvh_bmesh.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/report.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/scene.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/screen.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/seqeffects.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/seqmodifier.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/smoke.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/softbody.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/speaker.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/text.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/texture.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/unit.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/world.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/writeffmpeg.c
    branches/soc-2011-tomato/source/blender/blenlib/BLI_array.h
    branches/soc-2011-tomato/source/blender/blenlib/BLI_math_base.h
    branches/soc-2011-tomato/source/blender/blenlib/BLI_math_color.h
    branches/soc-2011-tomato/source/blender/blenlib/BLI_math_geom.h
    branches/soc-2011-tomato/source/blender/blenlib/BLI_math_matrix.h
    branches/soc-2011-tomato/source/blender/blenlib/BLI_math_rotation.h
    branches/soc-2011-tomato/source/blender/blenlib/BLI_math_vector.h
    branches/soc-2011-tomato/source/blender/blenlib/BLI_mempool.h
    branches/soc-2011-tomato/source/blender/blenlib/BLI_rect.h
    branches/soc-2011-tomato/source/blender/blenlib/BLI_string_cursor_utf8.h
    branches/soc-2011-tomato/source/blender/blenlib/BLI_utildefines.h
    branches/soc-2011-tomato/source/blender/blenlib/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_ghash.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_mempool.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/fileops.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/math_color_inline.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/math_geom.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/math_matrix.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/math_rotation.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/math_vector.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/math_vector_inline.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/noise.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/path_util.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/rct.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/scanfill.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/string.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/string_cursor_utf8.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/string_utf8.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/threads.c
    branches/soc-2011-tomato/source/blender/blenloader/intern/readblenentry.c
    branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-tomato/source/blender/blenloader/intern/runtime.c
    branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
    branches/soc-2011-tomato/source/blender/bmesh/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/bmesh/bmesh.h
    branches/soc-2011-tomato/source/blender/bmesh/bmesh_class.h
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_construct.c
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_construct.h
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_core.c
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_core.h
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_error.h
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_inline.h
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_interp.c
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_interp.h
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_iterators.c
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_iterators.h
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_iterators_inline.h
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_log.c
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_marking.c
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_marking.h
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mesh.c
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mesh.h
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mesh_conv.c
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mesh_conv.h
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mesh_validate.c
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mesh_validate.h
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mods.c
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mods.h
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_opdefines.c
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operator_api.h
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operator_api_inline.h
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operators.c
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operators_private.h
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_polygon.c
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_polygon.h
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_queries.c
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_queries.h
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_structure.c
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_structure.h
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_walkers.h
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_walkers_impl.c
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_walkers_private.h
    branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_bevel.c
    branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_connect.c
    branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_create.c
    branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_dissolve.c
    branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_dupe.c
    branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_edgesplit.c
    branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_extrude.c
    branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_hull.c
    branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_inset.c
    branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_join_triangles.c
    branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_mesh_conv.c
    branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_mirror.c
    branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_primitive.c
    branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_removedoubles.c
    branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_similar.c
    branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_smooth_laplacian.c
    branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_subdivide.c
    branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_symmetrize.c
    branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_triangulate.c
    branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_unsubdivide.c
    branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_utils.c
    branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_wireframe.c
    branches/soc-2011-tomato/source/blender/bmesh/tools/BME_bevel.c
    branches/soc-2011-tomato/source/blender/bmesh/tools/bmesh_bevel.c
    branches/soc-2011-tomato/source/blender/bmesh/tools/bmesh_decimate.h
    branches/soc-2011-tomato/source/blender/bmesh/tools/bmesh_decimate_collapse.c
    branches/soc-2011-tomato/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
    branches/soc-2011-tomato/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
    branches/soc-2011-tomato/source/blender/bmesh/tools/bmesh_edgesplit.c
    branches/soc-2011-tomato/source/blender/bmesh/tools/bmesh_edgesplit.h
    branches/soc-2011-tomato/source/blender/collada/AnimationExporter.cpp
    branches/soc-2011-tomato/source/blender/collada/AnimationExporter.h
    branches/soc-2011-tomato/source/blender/collada/AnimationImporter.cpp
    branches/soc-2011-tomato/source/blender/collada/ArmatureExporter.cpp
    branches/soc-2011-tomato/source/blender/collada/ArmatureExporter.h
    branches/soc-2011-tomato/source/blender/collada/ArmatureImporter.cpp
    branches/soc-2011-tomato/source/blender/collada/ArmatureImporter.h
    branches/soc-2011-tomato/source/blender/collada/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/collada/CameraExporter.cpp
    branches/soc-2011-tomato/source/blender/collada/DocumentExporter.cpp
    branches/soc-2011-tomato/source/blender/collada/DocumentImporter.cpp
    branches/soc-2011-tomato/source/blender/collada/DocumentImporter.h
    branches/soc-2011-tomato/source/blender/collada/ExportSettings.h
    branches/soc-2011-tomato/source/blender/collada/ExtraHandler.cpp
    branches/soc-2011-tomato/source/blender/collada/ExtraHandler.h
    branches/soc-2011-tomato/source/blender/collada/GeometryExporter.cpp
    branches/soc-2011-tomato/source/blender/collada/GeometryExporter.h
    branches/soc-2011-tomato/source/blender/collada/MeshImporter.cpp
    branches/soc-2011-tomato/source/blender/collada/MeshImporter.h
    branches/soc-2011-tomato/source/blender/collada/SConscript
    branches/soc-2011-tomato/source/blender/collada/SceneExporter.cpp
    branches/soc-2011-tomato/source/blender/collada/SceneExporter.h
    branches/soc-2011-tomato/source/blender/collada/TransformReader.cpp
    branches/soc-2011-tomato/source/blender/collada/TransformWriter.cpp
    branches/soc-2011-tomato/source/blender/collada/collada.cpp
    branches/soc-2011-tomato/source/blender/collada/collada.h
    branches/soc-2011-tomato/source/blender/collada/collada_internal.cpp
    branches/soc-2011-tomato/source/blender/collada/collada_internal.h
    branches/soc-2011-tomato/source/blender/collada/collada_utils.cpp
    branches/soc-2011-tomato/source/blender/collada/collada_utils.h
    branches/soc-2011-tomato/source/blender/compositor/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/compositor/SConscript
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_Node.h
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_CompositorNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_GroupNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ImageNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_PixelateNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ScaleNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SetAlphaNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SocketProxyNode.h
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_TranslateNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ViewerNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ChannelMatteOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_CompositorOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_CompositorOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_DilateErodeOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_InpaintOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_TextureOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_TextureOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_TranslateOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_TranslateOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerBaseOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerOperation.cpp
    branches/soc-2011-tomato/source/blender/editors/animation/anim_markers.c
    branches/soc-2011-tomato/source/blender/editors/animation/fmodifier_ui.c
    branches/soc-2011-tomato/source/blender/editors/animation/keyframes_edit.c
    branches/soc-2011-tomato/source/blender/editors/animation/keyframing.c
    branches/soc-2011-tomato/source/blender/editors/armature/editarmature.c
    branches/soc-2011-tomato/source/blender/editors/armature/meshlaplacian.c
    branches/soc-2011-tomato/source/blender/editors/armature/poselib.c
    branches/soc-2011-tomato/source/blender/editors/armature/poseobject.c
    branches/soc-2011-tomato/source/blender/editors/curve/editcurve.c
    branches/soc-2011-tomato/source/blender/editors/datafiles/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/editors/datafiles/SConscript
    branches/soc-2011-tomato/source/blender/editors/gpencil/drawgpencil.c
    branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_edit.c
    branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_paint.c
    branches/soc-2011-tomato/source/blender/editors/include/BIF_glutil.h
    branches/soc-2011-tomato/source/blender/editors/include/ED_datafiles.h
    branches/soc-2011-tomato/source/blender/editors/include/ED_mball.h
    branches/soc-2011-tomato/source/blender/editors/include/ED_mesh.h
    branches/soc-2011-tomato/source/blender/editors/include/ED_object.h
    branches/soc-2011-tomato/source/blender/editors/include/ED_physics.h
    branches/soc-2011-tomato/source/blender/editors/include/ED_transform.h
    branches/soc-2011-tomato/source/blender/editors/include/UI_icons.h
    branches/soc-2011-tomato/source/blender/editors/include/UI_interface.h
    branches/soc-2011-tomato/source/blender/editors/include/UI_interface_icons.h
    branches/soc-2011-tomato/source/blender/editors/include/UI_resources.h
    branches/soc-2011-tomato/source/blender/editors/interface/interface.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_anim.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_draw.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_icons.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_intern.h
    branches/soc-2011-tomato/source/blender/editors/interface/interface_layout.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_ops.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_panel.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_regions.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_templates.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_widgets.c
    branches/soc-2011-tomato/source/blender/editors/interface/resources.c
    branches/soc-2011-tomato/source/blender/editors/interface/view2d.c
    branches/soc-2011-tomato/source/blender/editors/interface/view2d_ops.c
    branches/soc-2011-tomato/source/blender/editors/io/io_collada.c
    branches/soc-2011-tomato/source/blender/editors/mask/mask_add.c
    branches/soc-2011-tomato/source/blender/editors/mask/mask_draw.c
    branches/soc-2011-tomato/source/blender/editors/mask/mask_ops.c
    branches/soc-2011-tomato/source/blender/editors/mesh/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_knife.c
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_loopcut.c
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_select.c
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_utils.c
    branches/soc-2011-tomato/source/blender/editors/mesh/mesh_data.c
    branches/soc-2011-tomato/source/blender/editors/mesh/mesh_intern.h
    branches/soc-2011-tomato/source/blender/editors/mesh/mesh_navmesh.c
    branches/soc-2011-tomato/source/blender/editors/mesh/mesh_ops.c
    branches/soc-2011-tomato/source/blender/editors/metaball/mball_edit.c
    branches/soc-2011-tomato/source/blender/editors/metaball/mball_ops.c
    branches/soc-2011-tomato/source/blender/editors/object/object_add.c
    branches/soc-2011-tomato/source/blender/editors/object/object_bake.c
    branches/soc-2011-tomato/source/blender/editors/object/object_constraint.c
    branches/soc-2011-tomato/source/blender/editors/object/object_edit.c
    branches/soc-2011-tomato/source/blender/editors/object/object_group.c
    branches/soc-2011-tomato/source/blender/editors/object/object_hook.c
    branches/soc-2011-tomato/source/blender/editors/object/object_modifier.c
    branches/soc-2011-tomato/source/blender/editors/object/object_ops.c
    branches/soc-2011-tomato/source/blender/editors/object/object_relations.c
    branches/soc-2011-tomato/source/blender/editors/object/object_transform.c
    branches/soc-2011-tomato/source/blender/editors/object/object_vgroup.c
    branches/soc-2011-tomato/source/blender/editors/physics/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/editors/physics/SConscript
    branches/soc-2011-tomato/source/blender/editors/physics/dynamicpaint_ops.c
    branches/soc-2011-tomato/source/blender/editors/physics/particle_edit.c
    branches/soc-2011-tomato/source/blender/editors/physics/physics_intern.h
    branches/soc-2011-tomato/source/blender/editors/physics/physics_ops.c
    branches/soc-2011-tomato/source/blender/editors/render/render_internal.c
    branches/soc-2011-tomato/source/blender/editors/render/render_preview.c
    branches/soc-2011-tomato/source/blender/editors/render/render_shading.c
    branches/soc-2011-tomato/source/blender/editors/render/render_update.c
    branches/soc-2011-tomato/source/blender/editors/render/render_view.c
    branches/soc-2011-tomato/source/blender/editors/screen/area.c
    branches/soc-2011-tomato/source/blender/editors/screen/glutil.c
    branches/soc-2011-tomato/source/blender/editors/screen/screen_edit.c
    branches/soc-2011-tomato/source/blender/editors/screen/screen_ops.c
    branches/soc-2011-tomato/source/blender/editors/screen/screendump.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_cursor.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image_2d.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_intern.h
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_ops.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_utils.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt_intern.h
    branches/soc-2011-tomato/source/blender/editors/sound/sound_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_action/action_edit.c
    branches/soc-2011-tomato/source/blender/editors/space_action/action_select.c
    branches/soc-2011-tomato/source/blender/editors/space_buttons/buttons_header.c
    branches/soc-2011-tomato/source/blender/editors/space_buttons/buttons_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_dopesheet_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_editor.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_toolbar.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c
    branches/soc-2011-tomato/source/blender/editors/space_console/console_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_console/console_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_file/file_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_file/file_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_file/filesel.c
    branches/soc-2011-tomato/source/blender/editors/space_file/space_file.c
    branches/soc-2011-tomato/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2011-tomato/source/blender/editors/space_image/image_buttons.c
    branches/soc-2011-tomato/source/blender/editors/space_image/image_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_image/image_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_image/space_image.c
    branches/soc-2011-tomato/source/blender/editors/space_info/info_intern.h
    branches/soc-2011-tomato/source/blender/editors/space_info/info_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_info/info_report.c
    branches/soc-2011-tomato/source/blender/editors/space_info/info_stats.c
    branches/soc-2011-tomato/source/blender/editors/space_info/space_info.c
    branches/soc-2011-tomato/source/blender/editors/space_info/textview.c
    branches/soc-2011-tomato/source/blender/editors/space_logic/logic_buttons.c
    branches/soc-2011-tomato/source/blender/editors/space_logic/logic_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_logic/logic_window.c
    branches/soc-2011-tomato/source/blender/editors/space_logic/space_logic.c
    branches/soc-2011-tomato/source/blender/editors/space_nla/nla_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_add.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_group.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_header.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_relationships.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_select.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_view.c
    branches/soc-2011-tomato/source/blender/editors/space_node/space_node.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_edit.c
    branches/soc-2011-tomato/source/blender/editors/space_script/script_edit.c
    branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_select.c
    branches/soc-2011-tomato/source/blender/editors/space_text/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/editors/space_text/space_text.c
    branches/soc-2011-tomato/source/blender/editors/space_text/text_autocomplete.c
    branches/soc-2011-tomato/source/blender/editors/space_text/text_format.c
    branches/soc-2011-tomato/source/blender/editors/space_text/text_format.h
    branches/soc-2011-tomato/source/blender/editors/space_text/text_format_osl.c
    branches/soc-2011-tomato/source/blender/editors/space_text/text_format_py.c
    branches/soc-2011-tomato/source/blender/editors/space_text/text_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_time/space_time.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/drawanimviz.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/drawvolume.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_fly.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_intern.h
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform.h
    branches/soc-2011-tomato/source/blender/editors/transform/transform_constraints.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_generics.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_input.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_manipulator.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_ops.c
    branches/soc-2011-tomato/source/blender/editors/util/undo.c
    branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_draw.c
    branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_intern.h
    branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_smart_stitch.c
    branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2011-tomato/source/blender/gpu/GPU_extensions.h
    branches/soc-2011-tomato/source/blender/gpu/GPU_material.h
    branches/soc-2011-tomato/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2011-tomato/source/blender/gpu/intern/gpu_codegen.c
    branches/soc-2011-tomato/source/blender/gpu/intern/gpu_codegen.h
    branches/soc-2011-tomato/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2011-tomato/source/blender/gpu/intern/gpu_extensions.c
    branches/soc-2011-tomato/source/blender/gpu/intern/gpu_material.c
    branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_material.glsl
    branches/soc-2011-tomato/source/blender/imbuf/IMB_colormanagement.h
    branches/soc-2011-tomato/source/blender/imbuf/IMB_imbuf.h
    branches/soc-2011-tomato/source/blender/imbuf/IMB_imbuf_types.h
    branches/soc-2011-tomato/source/blender/imbuf/IMB_thumbs.h
    branches/soc-2011-tomato/source/blender/imbuf/intern/anim_movie.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/dds/ColorBlock.h
    branches/soc-2011-tomato/source/blender/imbuf/intern/dds/DirectDrawSurface.h
    branches/soc-2011-tomato/source/blender/imbuf/intern/dds/Stream.cpp
    branches/soc-2011-tomato/source/blender/imbuf/intern/dds/dds_api.cpp
    branches/soc-2011-tomato/source/blender/imbuf/intern/divers.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/filter.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/indexer.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/jp2.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/soc-2011-tomato/source/blender/imbuf/intern/png.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/rectop.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/thumbs.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/util.c
    branches/soc-2011-tomato/source/blender/makesdna/DNA_ID.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_actuator_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_brush_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_image_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_material_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_mesh_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_meshdata_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_meta_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_modifier_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_node_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_object_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_screen_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_space_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_view3d_types.h
    branches/soc-2011-tomato/source/blender/makesdna/intern/makesdna.c
    branches/soc-2011-tomato/source/blender/makesrna/RNA_access.h
    branches/soc-2011-tomato/source/blender/makesrna/RNA_define.h
    branches/soc-2011-tomato/source/blender/makesrna/RNA_enum_types.h
    branches/soc-2011-tomato/source/blender/makesrna/RNA_types.h
    branches/soc-2011-tomato/source/blender/makesrna/SConscript
    branches/soc-2011-tomato/source/blender/makesrna/intern/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/makesrna/intern/SConscript
    branches/soc-2011-tomato/source/blender/makesrna/intern/makesrna.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_ID.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_access.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_action.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_animation.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_brush.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_color.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_define.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_fcurve.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_gpencil.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_image.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_image_api.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_internal_types.h
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_material.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_meta.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nla.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree_types.h
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object_api.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_render.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_rna.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene_api.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sequencer_api.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_texture_api.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_ui.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_ui_api.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2011-tomato/source/blender/modifiers/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/modifiers/MOD_modifiertypes.h
    branches/soc-2011-tomato/source/blender/modifiers/SConscript
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_boolean.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_boolean_util.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_build.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_collision.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_explode.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_laplaciansmooth.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_ocean.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_screw.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_skin.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_subsurf.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_triangulate.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_util.c
    branches/soc-2011-tomato/source/blender/nodes/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/nodes/SConscript
    branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_tree.c
    branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_util.h
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_blur.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_brightness.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_common.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_composite.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_crop.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_curves.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_defocus.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_despeckle.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_dilate.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_displace.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_filter.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_flip.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_gamma.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_glare.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_idMask.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_image.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_inpaint.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_invert.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_keying.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_keyingscreen.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_lensdist.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_levels.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mapUV.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mapValue.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mask.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_math.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_movieclip.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_normal.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_normalize.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_outputFile.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_premulkey.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_rgb.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_rotate.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_scale.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_setalpha.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_texture.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_tonemap.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_trackpos.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_transform.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_translate.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_value.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_viewer.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_zcombine.c
    branches/soc-2011-tomato/source/blender/nodes/intern/node_common.c
    branches/soc-2011-tomato/source/blender/nodes/intern/node_exec.c
    branches/soc-2011-tomato/source/blender/nodes/intern/node_exec.h
    branches/soc-2011-tomato/source/blender/nodes/intern/node_util.h
    branches/soc-2011-tomato/source/blender/nodes/shader/node_shader_tree.c
    branches/soc-2011-tomato/source/blender/nodes/shader/node_shader_util.c
    branches/soc-2011-tomato/source/blender/nodes/shader/node_shader_util.h
    branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_common.c
    branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_gamma.c
    branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_texture.c
    branches/soc-2011-tomato/source/blender/nodes/texture/node_texture_util.h
    branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_common.c
    branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_proc.c
    branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_texture.c
    branches/soc-2011-tomato/source/blender/python/BPY_extern.h
    branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_api.c
    branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_ops_call.c
    branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_types.c
    branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_types.h
    branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_types_customdata.c
    branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_types_meshdata.c
    branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_types_select.c
    branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_utils.c
    branches/soc-2011-tomato/source/blender/python/generic/bpy_internal_import.h
    branches/soc-2011-tomato/source/blender/python/generic/idprop_py_api.c
    branches/soc-2011-tomato/source/blender/python/intern/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/python/intern/bpy_app.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_app_build_options.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_interface.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_intern_string.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_intern_string.h
    branches/soc-2011-tomato/source/blender/python/intern/bpy_operator_wrap.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_props.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_rna_anim.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_rna_callback.c
    branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_geometry.c
    branches/soc-2011-tomato/source/blender/quicktime/apple/qtkit_export.m
    branches/soc-2011-tomato/source/blender/quicktime/apple/quicktime_export.c
    branches/soc-2011-tomato/source/blender/quicktime/quicktime_export.h
    branches/soc-2011-tomato/source/blender/render/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/render/extern/include/RE_engine.h
    branches/soc-2011-tomato/source/blender/render/extern/include/RE_render_ext.h
    branches/soc-2011-tomato/source/blender/render/extern/include/RE_shader_ext.h
    branches/soc-2011-tomato/source/blender/render/intern/include/envmap.h
    branches/soc-2011-tomato/source/blender/render/intern/include/pixelshading.h
    branches/soc-2011-tomato/source/blender/render/intern/include/render_types.h
    branches/soc-2011-tomato/source/blender/render/intern/include/texture.h
    branches/soc-2011-tomato/source/blender/render/intern/raytrace/rayobject_octree.cpp
    branches/soc-2011-tomato/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
    branches/soc-2011-tomato/source/blender/render/intern/source/convertblender.c
    branches/soc-2011-tomato/source/blender/render/intern/source/envmap.c
    branches/soc-2011-tomato/source/blender/render/intern/source/external_engine.c
    branches/soc-2011-tomato/source/blender/render/intern/source/imagetexture.c
    branches/soc-2011-tomato/source/blender/render/intern/source/multires_bake.c
    branches/soc-2011-tomato/source/blender/render/intern/source/pipeline.c
    branches/soc-2011-tomato/source/blender/render/intern/source/pixelblending.c
    branches/soc-2011-tomato/source/blender/render/intern/source/pixelshading.c
    branches/soc-2011-tomato/source/blender/render/intern/source/rayshade.c
    branches/soc-2011-tomato/source/blender/render/intern/source/render_result.c
    branches/soc-2011-tomato/source/blender/render/intern/source/render_texture.c
    branches/soc-2011-tomato/source/blender/render/intern/source/rendercore.c
    branches/soc-2011-tomato/source/blender/render/intern/source/renderdatabase.c
    branches/soc-2011-tomato/source/blender/render/intern/source/shadbuf.c
    branches/soc-2011-tomato/source/blender/render/intern/source/shadeinput.c
    branches/soc-2011-tomato/source/blender/render/intern/source/strand.c
    branches/soc-2011-tomato/source/blender/render/intern/source/voxeldata.c
    branches/soc-2011-tomato/source/blender/render/intern/source/zbuf.c
    branches/soc-2011-tomato/source/blender/windowmanager/WM_api.h
    branches/soc-2011-tomato/source/blender/windowmanager/WM_keymap.h
    branches/soc-2011-tomato/source/blender/windowmanager/WM_types.h
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_cursors.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_draw.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_gesture.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_keymap.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_playanim.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_subwindow.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_window.c
    branches/soc-2011-tomato/source/blender/windowmanager/wm_event_system.h
    branches/soc-2011-tomato/source/blender/windowmanager/wm_event_types.h
    branches/soc-2011-tomato/source/blender/windowmanager/wm_window.h
    branches/soc-2011-tomato/source/blenderplayer/CMakeLists.txt
    branches/soc-2011-tomato/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2011-tomato/source/creator/CMakeLists.txt
    branches/soc-2011-tomato/source/creator/creator.c
    branches/soc-2011-tomato/source/gameengine/BlenderRoutines/CMakeLists.txt
    branches/soc-2011-tomato/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
    branches/soc-2011-tomato/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
    branches/soc-2011-tomato/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/soc-2011-tomato/source/gameengine/BlenderRoutines/KX_BlenderGL.h
    branches/soc-2011-tomato/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp
    branches/soc-2011-tomato/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.cpp
    branches/soc-2011-tomato/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
    branches/soc-2011-tomato/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
    branches/soc-2011-tomato/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2011-tomato/source/gameengine/Converter/CMakeLists.txt
    branches/soc-2011-tomato/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2011-tomato/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/soc-2011-tomato/source/gameengine/Converter/KX_SoftBodyDeformer.cpp
    branches/soc-2011-tomato/source/gameengine/Converter/SConscript
    branches/soc-2011-tomato/source/gameengine/Expressions/EmptyValue.cpp
    branches/soc-2011-tomato/source/gameengine/Expressions/InputParser.cpp
    branches/soc-2011-tomato/source/gameengine/Expressions/InputParser.h
    branches/soc-2011-tomato/source/gameengine/Expressions/Operator2Expr.cpp
    branches/soc-2011-tomato/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_IInputDevice.h
    branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_IObject.h
    branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_LogicManager.h
    branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_PythonJoystick.cpp
    branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    branches/soc-2011-tomato/source/gameengine/GamePlayer/common/GPC_RawImage.cpp
    branches/soc-2011-tomato/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
    branches/soc-2011-tomato/source/gameengine/GamePlayer/common/GPC_RenderTools.h
    branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/CMakeLists.txt
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_BulletPhysicsController.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_CharacterWrapper.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_CharacterWrapper.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_GameObject.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_IPhysicsController.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Light.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_ObjectActuator.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_ObjectActuator.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SoundActuator.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_TrackToActuator.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/SConscript
    branches/soc-2011-tomato/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
    branches/soc-2011-tomato/source/gameengine/Network/NG_NetworkDeviceInterface.h
    branches/soc-2011-tomato/source/gameengine/Network/NG_NetworkMessage.h
    branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CMakeLists.txt
    branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/soc-2011-tomato/source/gameengine/Physics/Bullet/SConscript
    branches/soc-2011-tomato/source/gameengine/Physics/common/PHY_ICharacter.h
    branches/soc-2011-tomato/source/gameengine/Physics/common/PHY_IController.h
    branches/soc-2011-tomato/source/gameengine/Physics/common/PHY_IGraphicController.h
    branches/soc-2011-tomato/source/gameengine/Physics/common/PHY_IMotionState.h
    branches/soc-2011-tomato/source/gameengine/Physics/common/PHY_IPhysicsController.h
    branches/soc-2011-tomato/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.cpp
    branches/soc-2011-tomato/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_BucketManager.cpp
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_IRenderTools.h
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp
    branches/soc-2011-tomato/source/gameengine/SceneGraph/SG_ParentRelation.h
    branches/soc-2011-tomato/source/gameengine/VideoTexture/VideoFFmpeg.cpp
    branches/soc-2011-tomato/source/tests/batch_import.py
    branches/soc-2011-tomato/source/tests/bl_load_addons.py
    branches/soc-2011-tomato/source/tests/bl_load_py_modules.py
    branches/soc-2011-tomato/source/tests/bl_mesh_modifiers.py
    branches/soc-2011-tomato/source/tests/bl_mesh_validate.py
    branches/soc-2011-tomato/source/tests/bl_rst_completeness.py
    branches/soc-2011-tomato/source/tests/bl_run_operators.py
    branches/soc-2011-tomato/source/tests/pep8.py
    branches/soc-2011-tomato/source/tests/rna_info_dump.py
    branches/soc-2011-tomato/source/tests/rst_to_doctree_mini.py
    branches/soc-2011-tomato/source/tools/CTS/FBlender.py
    branches/soc-2011-tomato/source/tools/MakeGLStipple.py
    branches/soc-2011-tomato/source/tools/check_style_c.py
    branches/soc-2011-tomato/source/tools/spell_check_source.py
    branches/soc-2011-tomato/source/tools/spell_check_source_config.py

Added Paths:
-----------
    branches/soc-2011-tomato/build_files/buildbot/config/user-config-cuda-glibc211-i686.py
    branches/soc-2011-tomato/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.BL_ActionActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.BL_ArmatureActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.BL_ArmatureBone.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.BL_ArmatureChannel.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.BL_ArmatureConstraint.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.BL_ArmatureObject.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.BL_Shader.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.BL_ShapeActionActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.CListValue.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.CPropValue.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.CValue.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_ArmatureSensor.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_BlenderMaterial.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_Camera.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_CameraActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_CharacterWrapper.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_ConstraintActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_ConstraintWrapper.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_FontObject.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_GameActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_IpoActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_LibLoadStatus.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_LightObject.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_MeshProxy.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_MouseFocusSensor.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_NavMeshObject.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_NearSensor.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_NetworkMessageActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_NetworkMessageSensor.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_ObjectActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_ParentActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_PolyProxy.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_PolygonMaterial.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_RadarSensor.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_RaySensor.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_SCA_AddObjectActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_SCA_DynamicActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_SCA_EndObjectActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_SCA_ReplaceMeshActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_Scene.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_SceneActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_SoundActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_StateActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_SteeringActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_TouchSensor.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_TrackToActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_VehicleWrapper.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_VertexProxy.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_VisibilityActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.PyObjectPlus.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_2DFilterActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_ANDController.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_ActuatorSensor.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_AlwaysSensor.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_DelaySensor.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_IActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_IController.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_ILogicBrick.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_IObject.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_ISensor.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_JoystickSensor.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_KeyboardSensor.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_MouseSensor.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_NANDController.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_NORController.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_ORController.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_PropertyActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_PropertySensor.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_PythonController.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_PythonJoystick.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_PythonKeyboard.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_PythonMouse.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_RandomActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_RandomSensor.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_XNORController.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_XORController.rst
    branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen_monkeypatch.py
    branches/soc-2011-tomato/intern/cycles/kernel/kernel_sse2.cpp
    branches/soc-2011-tomato/intern/cycles/kernel/kernel_sse3.cpp
    branches/soc-2011-tomato/intern/opencl/
    branches/soc-2011-tomato/intern/opencl/CMakeLists.txt
    branches/soc-2011-tomato/intern/opencl/OCL_opencl.h
    branches/soc-2011-tomato/intern/opencl/SConscript
    branches/soc-2011-tomato/intern/opencl/intern/
    branches/soc-2011-tomato/intern/opencl/intern/OCL_opencl.c
    branches/soc-2011-tomato/intern/opencl/intern/clew.c
    branches/soc-2011-tomato/intern/opencl/intern/clew.h
    branches/soc-2011-tomato/intern/rigidbody/
    branches/soc-2011-tomato/intern/rigidbody/CMakeLists.txt
    branches/soc-2011-tomato/intern/rigidbody/RBI_api.h
    branches/soc-2011-tomato/intern/rigidbody/SConscript
    branches/soc-2011-tomato/intern/rigidbody/rb_bullet_api.cpp
    branches/soc-2011-tomato/release/datafiles/matcaps/
    branches/soc-2011-tomato/release/datafiles/matcaps/license.txt
    branches/soc-2011-tomato/release/datafiles/matcaps/mc01.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc02.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc03.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc04.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc05.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc06.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc07.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc08.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc09.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc10.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc11.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc12.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc13.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc14.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc15.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc16.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc17.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc18.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc19.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc20.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc21.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc22.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc23.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc24.jpg
    branches/soc-2011-tomato/release/datafiles/preview_cycles.blend
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/rigidbody.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_rigidbody.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_rigidbody.h
    branches/soc-2011-tomato/source/blender/blenkernel/intern/rigidbody.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_array.c
    branches/soc-2011-tomato/source/blender/bmesh/tools/bmesh_triangulate.c
    branches/soc-2011-tomato/source/blender/bmesh/tools/bmesh_triangulate.h
    branches/soc-2011-tomato/source/blender/collada/ControllerExporter.cpp
    branches/soc-2011-tomato/source/blender/collada/ControllerExporter.h
    branches/soc-2011-tomato/source/blender/collada/ImportSettings.cpp
    branches/soc-2011-tomato/source/blender/collada/ImportSettings.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_WrapOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_WrapOperation.h
    branches/soc-2011-tomato/source/blender/editors/physics/rigidbody_constraint.c
    branches/soc-2011-tomato/source/blender/editors/physics/rigidbody_object.c
    branches/soc-2011-tomato/source/blender/editors/physics/rigidbody_world.c
    branches/soc-2011-tomato/source/blender/editors/space_text/text_format_lua.c
    branches/soc-2011-tomato/source/blender/makesdna/DNA_rigidbody_types.h
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_meta_api.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_rigidbody.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_meshcache.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_meshcache_mdd.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_meshcache_pc2.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_meshcache_util.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_meshcache_util.h
    branches/soc-2011-tomato/source/blender/python/intern/bpy_app_translations.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_app_translations.h
    branches/soc-2011-tomato/source/blender/render/intern/source/bake.c

Removed Paths:
-------------
    branches/soc-2011-tomato/build_files/buildbot/config/user-config-glibc27-i686.py
    branches/soc-2011-tomato/build_files/buildbot/config/user-config-glibc27-x86_64.py
    branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-glibc27-i686.py
    branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-glibc27-x86_64.py
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.BL_ActionActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.BL_ArmatureActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.BL_ArmatureBone.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.BL_ArmatureChannel.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.BL_ArmatureConstraint.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.BL_ArmatureObject.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.BL_Shader.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.BL_ShapeActionActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.CListValue.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.CPropValue.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.CValue.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_ArmatureSensor.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_BlenderMaterial.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_Camera.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_CameraActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_CharacterWrapper.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_ConstraintActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_ConstraintWrapper.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_FontObject.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_GameActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_IpoActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_LibLoadStatus.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_LightObject.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_MeshProxy.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_MouseFocusSensor.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_NavMeshObject.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_NearSensor.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_NetworkMessageActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_NetworkMessageSensor.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_ObjectActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_ParentActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_PolyProxy.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_PolygonMaterial.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_RadarSensor.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_RaySensor.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_SCA_AddObjectActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_SCA_DynamicActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_SCA_EndObjectActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_SCA_ReplaceMeshActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_Scene.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_SceneActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_SoundActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_StateActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_SteeringActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_TouchSensor.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_TrackToActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_VehicleWrapper.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_VertexProxy.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_VisibilityActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.PyObjectPlus.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_2DFilterActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_ANDController.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_ActuatorSensor.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_AlwaysSensor.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_DelaySensor.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_IActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_IController.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_ILogicBrick.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_IObject.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_ISensor.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_JoystickSensor.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_KeyboardSensor.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_MouseSensor.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_NANDController.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_NORController.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_ORController.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_PropertyActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_PropertySensor.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_PythonController.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_PythonJoystick.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_PythonKeyboard.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_PythonMouse.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_RandomActuator.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_RandomSensor.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_XNORController.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.SCA_XORController.rst
    branches/soc-2011-tomato/intern/cycles/kernel/kernel_optimized.cpp
    branches/soc-2011-tomato/intern/opencl/CMakeLists.txt
    branches/soc-2011-tomato/intern/opencl/OCL_opencl.h
    branches/soc-2011-tomato/intern/opencl/SConscript
    branches/soc-2011-tomato/intern/opencl/intern/
    branches/soc-2011-tomato/intern/opencl/intern/OCL_opencl.c
    branches/soc-2011-tomato/intern/opencl/intern/clew.c
    branches/soc-2011-tomato/intern/opencl/intern/clew.h
    branches/soc-2011-tomato/intern/rigidbody/CMakeLists.txt
    branches/soc-2011-tomato/intern/rigidbody/RBI_api.h
    branches/soc-2011-tomato/intern/rigidbody/SConscript
    branches/soc-2011-tomato/intern/rigidbody/rb_bullet_api.cpp
    branches/soc-2011-tomato/release/datafiles/matcaps/license.txt
    branches/soc-2011-tomato/release/datafiles/matcaps/mc01.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc02.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc03.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc04.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc05.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc06.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc07.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc08.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc09.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc10.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc11.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc12.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc13.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc14.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc15.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc16.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc17.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc18.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc19.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc20.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc21.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc22.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc23.jpg
    branches/soc-2011-tomato/release/datafiles/matcaps/mc24.jpg
    branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_slide.c
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_slide.c
    branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_util.c
    branches/soc-2011-tomato/source/blender/opencl/

Property Changed:
----------------
    branches/soc-2011-tomato/
    branches/soc-2011-tomato/source/blender/editors/interface/interface.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-53627
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-54569

Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt	2013-02-15 04:14:53 UTC (rev 54569)
+++ branches/soc-2011-tomato/CMakeLists.txt	2013-02-15 06:33:27 UTC (rev 54570)
@@ -135,7 +135,6 @@
 option(WITH_PLAYER        "Build Player" OFF)
 option(WITH_OPENCOLORIO   "Enable OpenColorIO color management" ON)
 option(WITH_COMPOSITOR    "Enable the tile based nodal compositor" ON)
-option(WITH_COMPOSITOR_LEGACY "Enable legacy compositor" OFF)
 
 # GHOST Windowing Library Options
 option(WITH_GHOST_DEBUG   "Enable debugging output for the GHOST library" OFF)
@@ -269,6 +268,9 @@
 option(WITH_ASSERT_ABORT "Call abort() when raising an assertion through BLI_assert()" OFF)
 mark_as_advanced(WITH_ASSERT_ABORT)
 
+option(WITH_BOOST					"Enable features depending no boost" ON)
+
+
 if(APPLE)
 	cmake_minimum_required(VERSION 2.8.8)
 	cmake_policy(VERSION 2.8.8)
@@ -396,9 +398,22 @@
 	set(WITH_OPENIMAGEIO ON)
 endif()
 
-# auto enable boost for cycles, booleans, audaspace or i18n
-if(WITH_CYCLES OR WITH_MOD_BOOLEAN OR WITH_AUDASPACE OR WITH_INTERNATIONAL)
-	set(WITH_BOOST ON)
+# enable boost for cycles, booleans, audaspace or i18n
+# otherwise if the user disabled
+if(NOT WITH_BOOST)
+	# Explicitly disabled. so disable all deps.
+	set(WITH_CYCLES         OFF)
+	set(WITH_MOD_BOOLEAN    OFF)
+	set(WITH_AUDASPACE      OFF)
+	set(WITH_INTERNATIONAL  OFF)
+
+	set(WITH_OPENAL         OFF)  # depends on AUDASPACE
+	set(WITH_GAMEENGINE     OFF)  # depends on AUDASPACE
+elseif(WITH_CYCLES OR WITH_MOD_BOOLEAN OR WITH_AUDASPACE OR WITH_INTERNATIONAL)
+	# Keep enabled
+else()
+	# Enabled but we don't need it
+	set(WITH_BOOST OFF)
 endif()
 
 # auto enable llvm for cycles_osl
@@ -798,7 +813,11 @@
 		set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_X11_LIB}")
 
 		if(WITH_X11_XINPUT)
-			set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xinput_LIB}")
+			if(X11_Xinput_LIB)
+				set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xinput_LIB}")
+			else()
+				set(WITH_X11_XINPUT OFF)
+			endif()
 		endif()
 
 		if(WITH_X11_XF86VMODE)
@@ -1137,11 +1156,16 @@
 				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(WITH_CYCLES_OSL)
+				set(BOOST_LIBRARIES ${BOOST_LIBRARIES}
+					optimized libboost_wave-${BOOST_POSTFIX}
+					debug libboost_wave-${BOOST_DEBUG_POSTFIX})
+			endif()
 			if(WITH_INTERNATIONAL)
 				set(BOOST_LIBRARIES ${BOOST_LIBRARIES}
 					optimized libboost_locale-${BOOST_POSTFIX}
 					debug libboost_locale-${BOOST_DEBUG_POSTFIX})
-			endif(WITH_INTERNATIONAL)
+			endif()
 			set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")
 		endif()
 			
@@ -1327,6 +1351,11 @@
 					optimized boost_locale-${BOOST_POSTFIX}
 					debug boost_locale-${BOOST_DEBUG_POSTFIX}) 
 			endif()
+			if(WITH_CYCLES_OSL)
+				set(BOOST_LIBRARIES ${BOOST_LIBRARIES}
+					optimized boost_wave-${BOOST_POSTFIX}
+					debug boost_wave-${BOOST_DEBUG_POSTFIX}) 
+			endif()
 			set(BOOST_LIBPATH ${BOOST}/lib)
 			set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB -DBOOST_THREAD_USE_LIB ")
 		endif()
@@ -1442,11 +1471,11 @@
 			# module must be compiled against Python framework
 
 			# normally cached but not since we include them with blender
-			set(PYTHON_VERSION 3.2)
+			set(PYTHON_VERSION 3.3)
 			set(PYTHON_INCLUDE_DIR "/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/include/python${PYTHON_VERSION}m")
 			set(PYTHON_BINARY "/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/bin/python${PYTHON_VERSION}")
 			#set(PYTHON_LIBRARY python${PYTHON_VERSION})
-			set(PYTHON_LIBPATH "/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config-3.2m")
+			set(PYTHON_LIBPATH "/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config-${PYTHON_VERSION}m")
 			#set(PYTHON_LINKFLAGS "-u _PyMac_Error -framework Python")  # won't  build with this enabled
 		endif()
 		
@@ -2160,12 +2189,10 @@
 	info_cfg_option(WITH_MOD_FLUID)
 	info_cfg_option(WITH_MOD_OCEANSIM)
 
+	# debug
+	message(STATUS "HAVE_STDBOOL_H = ${HAVE_STDBOOL_H}")
+
 	info_cfg_text("")
 
 	message("${_config_msg}")
 endif()
-
-# debug
-message(
-    STATUS "HAVE_STDBOOL_H = ${HAVE_STDBOOL_H}"
-)

Modified: branches/soc-2011-tomato/SConstruct
===================================================================
--- branches/soc-2011-tomato/SConstruct	2013-02-15 04:14:53 UTC (rev 54569)
+++ branches/soc-2011-tomato/SConstruct	2013-02-15 06:33:27 UTC (rev 54570)
@@ -275,6 +275,11 @@
         if k not in B.arguments:
             env[k] = v
 
+if 'cudakernels' in B.targets:
+    env['WITH_BF_CYCLES'] = True
+    env['WITH_BF_CYCLES_CUDA_BINARIES'] = True
+    env['WITH_BF_PYTHON'] = False
+
 # Extended OSX_SDK and 3D_CONNEXION_CLIENT_LIBRARY and JAckOSX detection for OSX
 if env['OURPLATFORM']=='darwin':
     print B.bc.OKGREEN + "Detected Xcode version: -- " + B.bc.ENDC + env['XCODE_CUR_VER'] + " --"
@@ -512,63 +517,90 @@
 	data_to_c(FILE_FROM, FILE_TO, VAR_NAME)
 	
 
-data_to_c("source/blender/compositor/operations/COM_OpenCLKernels.cl",
-          B.root_build_dir + "data_headers/COM_OpenCLKernels.cl.h",
-          "datatoc_COM_OpenCLKernels_cl")
+if B.targets != ['cudakernels']:
+    data_to_c("source/blender/compositor/operations/COM_OpenCLKernels.cl",
+              B.root_build_dir + "data_headers/COM_OpenCLKernels.cl.h",
+              "datatoc_COM_OpenCLKernels_cl")
 
-data_to_c_simple("release/datafiles/startup.blend")
-data_to_c_simple("release/datafiles/preview.blend")
+    data_to_c_simple("release/datafiles/startup.blend")
+    data_to_c_simple("release/datafiles/preview.blend")
+    data_to_c_simple("release/datafiles/preview_cycles.blend")
 
-# --- glsl ---
-data_to_c_simple("source/blender/gpu/shaders/gpu_shader_material.glsl")
-data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vertex.glsl")
-data_to_c_simple("source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_frag.glsl")
-data_to_c_simple("source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_vert.glsl")
-data_to_c_simple("source/blender/gpu/shaders/gpu_shader_material.glsl")
-data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vsm_store_frag.glsl")
-data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vsm_store_vert.glsl")
+    # --- glsl ---
+    data_to_c_simple("source/blender/gpu/shaders/gpu_shader_material.glsl")
+    data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vertex.glsl")
+    data_to_c_simple("source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_frag.glsl")
+    data_to_c_simple("source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_vert.glsl")
+    data_to_c_simple("source/blender/gpu/shaders/gpu_shader_material.glsl")
+    data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vsm_store_frag.glsl")
+    data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vsm_store_vert.glsl")
 
-# --- blender ---
-data_to_c_simple("release/datafiles/bfont.pfb")
-data_to_c_simple("release/datafiles/bfont.ttf")
-data_to_c_simple("release/datafiles/bmonofont.ttf")
+    # --- blender ---
+    data_to_c_simple("release/datafiles/bfont.pfb")
+    data_to_c_simple("release/datafiles/bfont.ttf")
+    data_to_c_simple("release/datafiles/bmonofont.ttf")
 
-data_to_c_simple("release/datafiles/splash.png")
-data_to_c_simple("release/datafiles/blender_icons16.png")
-data_to_c_simple("release/datafiles/blender_icons32.png")
-data_to_c_simple("release/datafiles/prvicons.png")
+    data_to_c_simple("release/datafiles/splash.png")
+    data_to_c_simple("release/datafiles/blender_icons16.png")
+    data_to_c_simple("release/datafiles/blender_icons32.png")
+    data_to_c_simple("release/datafiles/prvicons.png")
 
-data_to_c_simple("release/datafiles/brushicons/add.png")
-data_to_c_simple("release/datafiles/brushicons/blob.png")
-data_to_c_simple("release/datafiles/brushicons/blur.png")
-data_to_c_simple("release/datafiles/brushicons/clay.png")
-data_to_c_simple("release/datafiles/brushicons/claystrips.png")
-data_to_c_simple("release/datafiles/brushicons/clone.png")
-data_to_c_simple("release/datafiles/brushicons/crease.png")
-data_to_c_simple("release/datafiles/brushicons/darken.png")
-data_to_c_simple("release/datafiles/brushicons/draw.png")
-data_to_c_simple("release/datafiles/brushicons/fill.png")
-data_to_c_simple("release/datafiles/brushicons/flatten.png")
-data_to_c_simple("release/datafiles/brushicons/grab.png")
-data_to_c_simple("release/datafiles/brushicons/inflate.png")
-data_to_c_simple("release/datafiles/brushicons/layer.png")
-data_to_c_simple("release/datafiles/brushicons/lighten.png")
-data_to_c_simple("release/datafiles/brushicons/mask.png")
-data_to_c_simple("release/datafiles/brushicons/mix.png")
-data_to_c_simple("release/datafiles/brushicons/multiply.png")
-data_to_c_simple("release/datafiles/brushicons/nudge.png")
-data_to_c_simple("release/datafiles/brushicons/pinch.png")
-data_to_c_simple("release/datafiles/brushicons/scrape.png")
-data_to_c_simple("release/datafiles/brushicons/smear.png")
-data_to_c_simple("release/datafiles/brushicons/smooth.png")
-data_to_c_simple("release/datafiles/brushicons/snake_hook.png")
-data_to_c_simple("release/datafiles/brushicons/soften.png")
-data_to_c_simple("release/datafiles/brushicons/subtract.png")
-data_to_c_simple("release/datafiles/brushicons/texdraw.png")

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list