[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52852] branches/soc-2011-tomato: Merging r51923 through r52851 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Mon Dec 10 16:18:05 CET 2012
Revision: 52852
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52852
Author: nazgul
Date: 2012-12-10 15:18:00 +0000 (Mon, 10 Dec 2012)
Log Message:
-----------
Merging r51923 through r52851 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51923
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52851
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/GNUmakefile
branches/soc-2011-tomato/SConstruct
branches/soc-2011-tomato/build_files/build_environment/prepare_release_env.sh
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-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-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/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/build_files/buildbot/master.cfg
branches/soc-2011-tomato/build_files/cmake/Modules/FindOpenColorIO.cmake
branches/soc-2011-tomato/build_files/cmake/Modules/FindOpenImageIO.cmake
branches/soc-2011-tomato/build_files/cmake/Modules/FindPythonLibsUnix.cmake
branches/soc-2011-tomato/build_files/cmake/cmake_consistency_check.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/example_scripts/make_quicky.py
branches/soc-2011-tomato/build_files/cmake/macros.cmake
branches/soc-2011-tomato/build_files/cmake/project_info.py
branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
branches/soc-2011-tomato/build_files/scons/config/freebsd7-config.py
branches/soc-2011-tomato/build_files/scons/config/freebsd8-config.py
branches/soc-2011-tomato/build_files/scons/config/freebsd9-config.py
branches/soc-2011-tomato/build_files/scons/config/linux-config.py
branches/soc-2011-tomato/build_files/scons/config/linuxcross-config.py
branches/soc-2011-tomato/build_files/scons/config/win32-mingw-config.py
branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py
branches/soc-2011-tomato/build_files/scons/config/win64-mingw-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/blender_file_format/BlendFileDnaExporter_25.py
branches/soc-2011-tomato/doc/blender_file_format/BlendFileReader.py
branches/soc-2011-tomato/doc/manpage/blender.1
branches/soc-2011-tomato/doc/python_api/rst/bge.logic.rst
branches/soc-2011-tomato/doc/python_api/rst/bge.types.rst
branches/soc-2011-tomato/doc/python_api/rst/bgl.rst
branches/soc-2011-tomato/doc/python_api/rst/gpu.rst
branches/soc-2011-tomato/doc/python_api/rst/include__bmesh.rst
branches/soc-2011-tomato/doc/python_api/rst/info_gotcha.rst
branches/soc-2011-tomato/doc/python_api/rst/info_overview.rst
branches/soc-2011-tomato/doc/python_api/rst/info_quickstart.rst
branches/soc-2011-tomato/doc/python_api/rst/info_tips_and_tricks.rst
branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py
branches/soc-2011-tomato/extern/CMakeLists.txt
branches/soc-2011-tomato/extern/SConscript
branches/soc-2011-tomato/extern/glew/src/glew.c
branches/soc-2011-tomato/extern/libmv/CMakeLists.txt
branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/resect.cc
branches/soc-2011-tomato/extern/libmv/libmv-capi.cpp
branches/soc-2011-tomato/extern/xdnd/xdnd.c
branches/soc-2011-tomato/intern/CMakeLists.txt
branches/soc-2011-tomato/intern/SConscript
branches/soc-2011-tomato/intern/audaspace/intern/AUD_FileWriter.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_LinearResampleReader.cpp
branches/soc-2011-tomato/intern/bsp/intern/BOP_CarveInterface.cpp
branches/soc-2011-tomato/intern/container/CTR_HashedPtr.h
branches/soc-2011-tomato/intern/cycles/CMakeLists.txt
branches/soc-2011-tomato/intern/cycles/SConscript
branches/soc-2011-tomato/intern/cycles/app/CMakeLists.txt
branches/soc-2011-tomato/intern/cycles/app/cycles_test.cpp
branches/soc-2011-tomato/intern/cycles/blender/CCL_api.h
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/enums.py
branches/soc-2011-tomato/intern/cycles/blender/addon/osl.py
branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py
branches/soc-2011-tomato/intern/cycles/blender/blender_camera.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_particles.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_sync.h
branches/soc-2011-tomato/intern/cycles/blender/blender_util.h
branches/soc-2011-tomato/intern/cycles/cmake/external_libs.cmake
branches/soc-2011-tomato/intern/cycles/device/device.cpp
branches/soc-2011-tomato/intern/cycles/device/device.h
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_intern.h
branches/soc-2011-tomato/intern/cycles/device/device_task.cpp
branches/soc-2011-tomato/intern/cycles/kernel/CMakeLists.txt
branches/soc-2011-tomato/intern/cycles/kernel/SConscript
branches/soc-2011-tomato/intern/cycles/kernel/closure/bsdf_ward.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel.cpp
branches/soc-2011-tomato/intern/cycles/kernel/kernel_accumulate.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_attribute.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_camera.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_globals.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_light.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_object.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_projection.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_shader.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_triangle.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_types.h
branches/soc-2011-tomato/intern/cycles/kernel/osl/CMakeLists.txt
branches/soc-2011-tomato/intern/cycles/kernel/osl/background.cpp
branches/soc-2011-tomato/intern/cycles/kernel/osl/osl_closures.cpp
branches/soc-2011-tomato/intern/cycles/kernel/osl/osl_closures.h
branches/soc-2011-tomato/intern/cycles/kernel/osl/osl_globals.h
branches/soc-2011-tomato/intern/cycles/kernel/osl/osl_services.cpp
branches/soc-2011-tomato/intern/cycles/kernel/osl/osl_services.h
branches/soc-2011-tomato/intern/cycles/kernel/osl/osl_shader.cpp
branches/soc-2011-tomato/intern/cycles/kernel/osl/osl_shader.h
branches/soc-2011-tomato/intern/cycles/kernel/shaders/CMakeLists.txt
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_brick_texture.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_brightness.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_checker_texture.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_convert_from_color.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_convert_from_float.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_convert_from_int.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_convert_from_normal.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_convert_from_point.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_convert_from_vector.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_environment_texture.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_geometry.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_gradient_texture.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_hsv.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_image_texture.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_light_falloff.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_magic_texture.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_mapping.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_mix.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_musgrave_texture.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_noise_texture.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_rgb_ramp.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_sky_texture.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_texture_coordinate.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_voronoi_texture.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_ward_bsdf.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_wave_texture.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/stdosl.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_brick.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_bsdf.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_closure.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_geometry.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_hsv.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_math.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_ramp.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_tex_coord.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_texture.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_types.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_voronoi.h
branches/soc-2011-tomato/intern/cycles/render/attribute.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/graph.cpp
branches/soc-2011-tomato/intern/cycles/render/graph.h
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/mesh.cpp
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/object.h
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/particles.cpp
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.cpp
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/util/CMakeLists.txt
branches/soc-2011-tomato/intern/cycles/util/util_attribute.cpp
branches/soc-2011-tomato/intern/cycles/util/util_boundbox.h
branches/soc-2011-tomato/intern/cycles/util/util_opencl.cpp
branches/soc-2011-tomato/intern/cycles/util/util_progress.h
branches/soc-2011-tomato/intern/cycles/util/util_stats.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/cycles/util/util_thread.h
branches/soc-2011-tomato/intern/cycles/util/util_transform.cpp
branches/soc-2011-tomato/intern/cycles/util/util_transform.h
branches/soc-2011-tomato/intern/cycles/util/util_types.h
branches/soc-2011-tomato/intern/elbeem/intern/ntl_geometryobject.cpp
branches/soc-2011-tomato/intern/elbeem/intern/ntl_world.cpp
branches/soc-2011-tomato/intern/elbeem/intern/ntl_world.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/intern/GHOST_NDOFManagerX11.cpp
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_SystemSDL.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowSDL.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2011-tomato/intern/guardedalloc/cpp/mallocn.cpp
branches/soc-2011-tomato/intern/guardedalloc/intern/mallocn.c
branches/soc-2011-tomato/intern/iksolver/intern/IK_QJacobianSolver.cpp
branches/soc-2011-tomato/intern/itasc/CMakeLists.txt
branches/soc-2011-tomato/intern/itasc/kdl/chain.hpp
branches/soc-2011-tomato/intern/itasc/kdl/tree.hpp
branches/soc-2011-tomato/intern/memutil/MEM_CacheLimiter.h
branches/soc-2011-tomato/intern/memutil/MEM_SmartPtr.h
branches/soc-2011-tomato/intern/opencolorio/ocio_impl.cc
branches/soc-2011-tomato/intern/opennl/CMakeLists.txt
branches/soc-2011-tomato/intern/smoke/intern/FFT_NOISE.h
branches/soc-2011-tomato/intern/smoke/intern/WTURBULENCE.cpp
branches/soc-2011-tomato/intern/tools/bpy_introspect_ui.py
branches/soc-2011-tomato/intern/tools/credits_svn_gen.py
branches/soc-2011-tomato/intern/tools/dump_rna2xml.py
branches/soc-2011-tomato/intern/tools/pydna.py
branches/soc-2011-tomato/intern/utfconv/utfconv.h
branches/soc-2011-tomato/release/datafiles/blender_icons.png
branches/soc-2011-tomato/release/datafiles/prvicons.png
branches/soc-2011-tomato/release/datafiles/splash.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/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_languages_menu.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/bpy/ops.py
branches/soc-2011-tomato/release/scripts/modules/bpy/utils.py
branches/soc-2011-tomato/release/scripts/modules/bpy_extras/mesh_utils.py
branches/soc-2011-tomato/release/scripts/modules/bpy_types.py
branches/soc-2011-tomato/release/scripts/modules/rna_xml.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/startup/bl_operators/image.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/object.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/presets.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/screen_play_rendered_anim.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/uvcalc_smart_project.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_bone.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_camera.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_curve.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_particle.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_graph.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_userpref.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/bmesh_simple.py
branches/soc-2011-tomato/release/scripts/templates/script_stub.py
branches/soc-2011-tomato/release/text/readme.html
branches/soc-2011-tomato/source/blender/avi/intern/avi.c
branches/soc-2011-tomato/source/blender/avi/intern/avi_rgb.c
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.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_blender.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_global.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_icons.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_mesh.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_modifier.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_multires.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_node.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_text.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_utildefines.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/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/bmfont.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/brush.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/collision.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/colortools.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/context.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/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/idcode.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/lamp.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_evaluate.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mask_rasterize.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/modifier.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/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/particle.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/pointcache.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/scene.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/shrinkwrap.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/smoke.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/sound.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/suggestions.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/text.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.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_bpath.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_endian_switch.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_endian_switch_inline.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_ghash.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_math.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_inline.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_math_matrix.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_math_vector.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_pbvh.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_quadric.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_rect.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_scanfill.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_string_utf8.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_threads.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/PIL_time.h
branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2011-tomato/source/blender/blenlib/intern/bpath.c
branches/soc-2011-tomato/source/blender/blenlib/intern/math_base_inline.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_geom_inline.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/pbvh.c
branches/soc-2011-tomato/source/blender/blenlib/intern/quadric.c
branches/soc-2011-tomato/source/blender/blenlib/intern/scanfill.c
branches/soc-2011-tomato/source/blender/blenlib/intern/smallhash.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/blenlib/intern/voronoi.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/blenloader/intern/versioning_250.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_interp.c
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_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_mods.c
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.h
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_private.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/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_slide.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_subdivide.h
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/collada/AnimationImporter.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/ImageExporter.cpp
branches/soc-2011-tomato/source/blender/collada/MaterialExporter.cpp
branches/soc-2011-tomato/source/blender/collada/MeshImporter.cpp
branches/soc-2011-tomato/source/blender/collada/TransformReader.cpp
branches/soc-2011-tomato/source/blender/collada/collada_utils.cpp
branches/soc-2011-tomato/source/blender/compositor/CMakeLists.txt
branches/soc-2011-tomato/source/blender/compositor/intern/COM_Converter.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionGroup.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystem.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_Node.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_Node.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_NodeOperation.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkPackage.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BlurNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ImageNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MuteNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_NormalNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_OutputFileNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ScaleNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CropOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GammaCorrectOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ImageOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MovieDistortionOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_NormalizeOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_PixelateOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_RenderLayersBaseProg.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ScaleOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ScaleOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_TrackPositionOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
branches/soc-2011-tomato/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_draw.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_filter.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_markers.c
branches/soc-2011-tomato/source/blender/editors/animation/keyingsets.c
branches/soc-2011-tomato/source/blender/editors/armature/editarmature.c
branches/soc-2011-tomato/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2011-tomato/source/blender/editors/curve/editcurve.c
branches/soc-2011-tomato/source/blender/editors/curve/editfont.c
branches/soc-2011-tomato/source/blender/editors/gpencil/editaction_gpencil.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/ED_gpencil.h
branches/soc-2011-tomato/source/blender/editors/include/ED_image.h
branches/soc-2011-tomato/source/blender/editors/include/ED_mask.h
branches/soc-2011-tomato/source/blender/editors/include/ED_mesh.h
branches/soc-2011-tomato/source/blender/editors/include/ED_view3d.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_resources.h
branches/soc-2011-tomato/source/blender/editors/interface/interface.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_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_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/mask/mask_editaction.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_add.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_bvh.c
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_rip.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_select.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_slide.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_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/object/object_add.c
branches/soc-2011-tomato/source/blender/editors/object/object_bake.c
branches/soc-2011-tomato/source/blender/editors/object/object_edit.c
branches/soc-2011-tomato/source/blender/editors/object/object_modifier.c
branches/soc-2011-tomato/source/blender/editors/object/object_relations.c
branches/soc-2011-tomato/source/blender/editors/object/object_shapekey.c
branches/soc-2011-tomato/source/blender/editors/object/object_vgroup.c
branches/soc-2011-tomato/source/blender/editors/physics/particle_edit.c
branches/soc-2011-tomato/source/blender/editors/physics/physics_fluid.c
branches/soc-2011-tomato/source/blender/editors/render/render_internal.c
branches/soc-2011-tomato/source/blender/editors/render/render_opengl.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/screen/screen_ops.c
branches/soc-2011-tomato/source/blender/editors/screen/screendump.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.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/space_action/action_edit.c
branches/soc-2011-tomato/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2011-tomato/source/blender/editors/space_buttons/buttons_texture.c
branches/soc-2011-tomato/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_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_utils.c
branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c
branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.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_console/space_console.c
branches/soc-2011-tomato/source/blender/editors/space_file/filelist.c
branches/soc-2011-tomato/source/blender/editors/space_file/filesel.c
branches/soc-2011-tomato/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_graph/graph_edit.c
branches/soc-2011-tomato/source/blender/editors/space_graph/graph_ops.c
branches/soc-2011-tomato/source/blender/editors/space_graph/space_graph.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_edit.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_ops.c
branches/soc-2011-tomato/source/blender/editors/space_info/space_info.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_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_outliner/outliner_select.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/SConscript
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_text/space_text.c
branches/soc-2011-tomato/source/blender/editors/space_text/text_draw.c
branches/soc-2011-tomato/source/blender/editors/space_text/text_intern.h
branches/soc-2011-tomato/source/blender/editors/space_text/text_ops.c
branches/soc-2011-tomato/source/blender/editors/space_text/text_python.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/space_view3d.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_header.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_iterators.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_project.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_select.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/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/transform/SConscript
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_manipulator.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_snap.c
branches/soc-2011-tomato/source/blender/editors/util/numinput.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_buttons.c
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_material.h
branches/soc-2011-tomato/source/blender/gpu/SConscript
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_codegen.c
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/gpu/shaders/gpu_shader_vertex.glsl
branches/soc-2011-tomato/source/blender/ikplugin/intern/ikplugin_api.c
branches/soc-2011-tomato/source/blender/ikplugin/intern/iksolver_plugin.c
branches/soc-2011-tomato/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/soc-2011-tomato/source/blender/imbuf/intern/anim_movie.c
branches/soc-2011-tomato/source/blender/imbuf/intern/cineon/cineon_dpx.c
branches/soc-2011-tomato/source/blender/imbuf/intern/cineon/cineonlib.c
branches/soc-2011-tomato/source/blender/imbuf/intern/cineon/dpxlib.c
branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c
branches/soc-2011-tomato/source/blender/imbuf/intern/dds/BlockDXT.h
branches/soc-2011-tomato/source/blender/imbuf/intern/dds/FlipDXT.cpp
branches/soc-2011-tomato/source/blender/imbuf/intern/dds/SConscript
branches/soc-2011-tomato/source/blender/imbuf/intern/dds/Stream.h
branches/soc-2011-tomato/source/blender/imbuf/intern/divers.c
branches/soc-2011-tomato/source/blender/imbuf/intern/imageprocess.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/jpeg.c
branches/soc-2011-tomato/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2011-tomato/source/blender/imbuf/intern/openexr/openexr_multi.h
branches/soc-2011-tomato/source/blender/imbuf/intern/openexr/openexr_stub.cpp
branches/soc-2011-tomato/source/blender/imbuf/intern/radiance_hdr.c
branches/soc-2011-tomato/source/blender/imbuf/intern/readimage.c
branches/soc-2011-tomato/source/blender/imbuf/intern/rectop.c
branches/soc-2011-tomato/source/blender/imbuf/intern/scaling.c
branches/soc-2011-tomato/source/blender/imbuf/intern/util.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_action_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_curve_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_gpencil_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_text_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_tracking_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_userdef_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/intern/makesrna.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_boid.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_constraint.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_curve.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_lamp.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_mask.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_modifier.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_force.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_particle.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_pose.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_sequencer.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_speaker.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_text.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_texture.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_tracking.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/makesrna/intern/rna_wm_api.c
branches/soc-2011-tomato/source/blender/makesrna/rna_cleanup/rna_cleaner.py
branches/soc-2011-tomato/source/blender/makesrna/rna_cleanup/rna_cleaner_merge.py
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/intern/MOD_armature.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_array.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_decimate.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_laplaciansmooth.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_skin.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_solidify.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/NOD_composite.h
branches/soc-2011-tomato/source/blender/nodes/NOD_shader.h
branches/soc-2011-tomato/source/blender/nodes/NOD_socket.h
branches/soc-2011-tomato/source/blender/nodes/NOD_texture.h
branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_tree.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_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_image.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_math.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_outputFile.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_viewer.c
branches/soc-2011-tomato/source/blender/nodes/intern/node_socket.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_bump.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_material.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_math.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_normal.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_script.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_image.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_texture.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_vectMath.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_image.c
branches/soc-2011-tomato/source/blender/python/bmesh/CMakeLists.txt
branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_api.c
branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_ops.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/bgl.c
branches/soc-2011-tomato/source/blender/python/generic/bpy_internal_import.c
branches/soc-2011-tomato/source/blender/python/generic/idprop_py_api.c
branches/soc-2011-tomato/source/blender/python/generic/py_capi_utils.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_app.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_rna.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_rna_array.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_traceback.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_util.h
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils.h
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Color.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Euler.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Quaternion.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2011-tomato/source/blender/quicktime/quicktime_export.h
branches/soc-2011-tomato/source/blender/render/extern/include/RE_engine.h
branches/soc-2011-tomato/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2011-tomato/source/blender/render/intern/include/initrender.h
branches/soc-2011-tomato/source/blender/render/intern/include/render_types.h
branches/soc-2011-tomato/source/blender/render/intern/raytrace/rayobject_internal.h
branches/soc-2011-tomato/source/blender/render/intern/raytrace/rayobject_octree.cpp
branches/soc-2011-tomato/source/blender/render/intern/raytrace/rayobject_rtbuild.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/initrender.c
branches/soc-2011-tomato/source/blender/render/intern/source/pipeline.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/shadeoutput.c
branches/soc-2011-tomato/source/blender/render/intern/source/sunsky.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_types.h
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_jobs.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_window.c
branches/soc-2011-tomato/source/blender/windowmanager/wm_event_types.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/KX_BlenderGL.cpp
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/Converter/BL_ArmatureChannel.cpp
branches/soc-2011-tomato/source/gameengine/Converter/BL_ArmatureConstraint.cpp
branches/soc-2011-tomato/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/soc-2011-tomato/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2011-tomato/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2011-tomato/source/gameengine/Converter/SConscript
branches/soc-2011-tomato/source/gameengine/Expressions/IntValue.cpp
branches/soc-2011-tomato/source/gameengine/Expressions/ListValue.cpp
branches/soc-2011-tomato/source/gameengine/Expressions/PyObjectPlus.cpp
branches/soc-2011-tomato/source/gameengine/Expressions/PyObjectPlus.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_IController.cpp
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_MouseSensor.cpp
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_PropertySensor.cpp
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_PythonController.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_PythonKeyboard.cpp
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_PythonMouse.cpp
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_RandomActuator.cpp
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_RandomSensor.cpp
branches/soc-2011-tomato/source/gameengine/GamePlayer/common/SConscript
branches/soc-2011-tomato/source/gameengine/GamePlayer/common/bmfont.cpp
branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/SConscript
branches/soc-2011-tomato/source/gameengine/Ketsji/BL_Material.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/BL_Material.h
branches/soc-2011-tomato/source/gameengine/Ketsji/BL_Shader.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/BL_Shader.h
branches/soc-2011-tomato/source/gameengine/Ketsji/BL_Texture.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_BlenderMaterial.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Camera.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_CharacterWrapper.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Dome.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Dome.h
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_KetsjiEngine.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Light.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_MeshProxy.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PolyProxy.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PolygonMaterial.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_PythonInitTypes.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PythonSeq.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Scene.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_VertexProxy.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_VertexProxy.h
branches/soc-2011-tomato/source/gameengine/Network/NG_NetworkDeviceInterface.h
branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2011-tomato/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp
branches/soc-2011-tomato/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
branches/soc-2011-tomato/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_ICanvas.h
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_MaterialBucket.h
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_TexVert.cpp
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_TexVert.h
branches/soc-2011-tomato/source/gameengine/SceneGraph/SG_IObject.h
branches/soc-2011-tomato/source/gameengine/VideoTexture/BlendType.h
branches/soc-2011-tomato/source/gameengine/VideoTexture/Common.h
branches/soc-2011-tomato/source/gameengine/VideoTexture/Exception.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/Exception.h
branches/soc-2011-tomato/source/gameengine/VideoTexture/FilterBase.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/FilterBase.h
branches/soc-2011-tomato/source/gameengine/VideoTexture/FilterBlueScreen.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/FilterBlueScreen.h
branches/soc-2011-tomato/source/gameengine/VideoTexture/FilterColor.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/FilterColor.h
branches/soc-2011-tomato/source/gameengine/VideoTexture/FilterNormal.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/FilterNormal.h
branches/soc-2011-tomato/source/gameengine/VideoTexture/FilterSource.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/FilterSource.h
branches/soc-2011-tomato/source/gameengine/VideoTexture/ImageBase.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/ImageBase.h
branches/soc-2011-tomato/source/gameengine/VideoTexture/ImageBuff.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/ImageBuff.h
branches/soc-2011-tomato/source/gameengine/VideoTexture/ImageMix.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/ImageMix.h
branches/soc-2011-tomato/source/gameengine/VideoTexture/ImageRender.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/ImageRender.h
branches/soc-2011-tomato/source/gameengine/VideoTexture/ImageViewport.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/ImageViewport.h
branches/soc-2011-tomato/source/gameengine/VideoTexture/PyTypeList.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/PyTypeList.h
branches/soc-2011-tomato/source/gameengine/VideoTexture/Texture.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/Texture.h
branches/soc-2011-tomato/source/gameengine/VideoTexture/VideoBase.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/VideoBase.h
branches/soc-2011-tomato/source/gameengine/VideoTexture/VideoFFmpeg.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/VideoFFmpeg.h
branches/soc-2011-tomato/source/gameengine/VideoTexture/blendVideoTex.cpp
branches/soc-2011-tomato/source/tests/bl_run_operators.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
branches/soc-2011-tomato/source/tools/tag_release.py
Added Paths:
-----------
branches/soc-2011-tomato/build_files/build_environment/install_deps.sh
branches/soc-2011-tomato/build_files/buildbot/slave_rsync.py
branches/soc-2011-tomato/build_files/cmake/Modules/FindIcuLinux.cmake
branches/soc-2011-tomato/doc/python_api/examples/bmesh.ops.1.py
branches/soc-2011-tomato/doc/python_api/rst/info_api_reference.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/intern/cycles/kernel/closure/bsdf_phong_ramp.h
branches/soc-2011-tomato/intern/cycles/kernel/osl/SConscript
branches/soc-2011-tomato/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp
branches/soc-2011-tomato/intern/cycles/kernel/shaders/SConscript
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_ambient_occlusion.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_convert_from_string.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_normal_map.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_refraction_bsdf.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_tangent.osl
branches/soc-2011-tomato/intern/locale/
branches/soc-2011-tomato/intern/locale/CMakeLists.txt
branches/soc-2011-tomato/intern/locale/SConscript
branches/soc-2011-tomato/intern/locale/boost_locale_wrapper.cpp
branches/soc-2011-tomato/intern/locale/boost_locale_wrapper.h
branches/soc-2011-tomato/release/darwin/
branches/soc-2011-tomato/release/darwin/blender.app/
branches/soc-2011-tomato/release/darwin/blender.app/Contents/
branches/soc-2011-tomato/release/darwin/blender.app/Contents/Info.plist
branches/soc-2011-tomato/release/darwin/blender.app/Contents/MacOS/
branches/soc-2011-tomato/release/darwin/blender.app/Contents/MacOS/blender
branches/soc-2011-tomato/release/darwin/blender.app/Contents/PkgInfo
branches/soc-2011-tomato/release/darwin/blender.app/Contents/Resources/
branches/soc-2011-tomato/release/darwin/blender.app/Contents/Resources/blender file icon.icns
branches/soc-2011-tomato/release/darwin/blender.app/Contents/Resources/blender icon.icns
branches/soc-2011-tomato/release/darwin/blenderplayer.app/
branches/soc-2011-tomato/release/darwin/blenderplayer.app/Contents/
branches/soc-2011-tomato/release/darwin/blenderplayer.app/Contents/Info.plist
branches/soc-2011-tomato/release/darwin/blenderplayer.app/Contents/MacOS/
branches/soc-2011-tomato/release/darwin/blenderplayer.app/Contents/MacOS/blenderplayer
branches/soc-2011-tomato/release/darwin/blenderplayer.app/Contents/PkgInfo
branches/soc-2011-tomato/release/darwin/blenderplayer.app/Contents/Resources/
branches/soc-2011-tomato/release/darwin/blenderplayer.app/Contents/Resources/blender file icon.icns
branches/soc-2011-tomato/release/darwin/blenderplayer.app/Contents/Resources/blender player icon.icns
branches/soc-2011-tomato/release/darwin/set_simulation_threads.app/
branches/soc-2011-tomato/release/darwin/set_simulation_threads.app/Contents/
branches/soc-2011-tomato/release/darwin/set_simulation_threads.app/Contents/Info.plist
branches/soc-2011-tomato/release/darwin/set_simulation_threads.app/Contents/MacOS/
branches/soc-2011-tomato/release/darwin/set_simulation_threads.app/Contents/MacOS/applet
branches/soc-2011-tomato/release/darwin/set_simulation_threads.app/Contents/PkgInfo
branches/soc-2011-tomato/release/darwin/set_simulation_threads.app/Contents/Resources/
branches/soc-2011-tomato/release/darwin/set_simulation_threads.app/Contents/Resources/Scripts/
branches/soc-2011-tomato/release/darwin/set_simulation_threads.app/Contents/Resources/Scripts/main.scpt
branches/soc-2011-tomato/release/darwin/set_simulation_threads.app/Contents/Resources/applet.icns
branches/soc-2011-tomato/release/darwin/set_simulation_threads.app/Contents/Resources/applet.rsrc
branches/soc-2011-tomato/release/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/
branches/soc-2011-tomato/release/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/TXT.rtf
branches/soc-2011-tomato/release/scripts/templates/bmesh_simple_editmode.py
branches/soc-2011-tomato/source/blender/blenlib/BLI_math_interp.h
branches/soc-2011-tomato/source/blender/blenlib/intern/math_interp.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_bevel.c
branches/soc-2011-tomato/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2011-tomato/source/blender/bmesh/tools/bmesh_bevel.h
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/compositor/nodes/COM_MapRangeNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MapRangeNode.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MapRangeOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MapRangeOperation.h
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_triangulate.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mapRange.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_normal_map.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tangent.c
branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_ops_call.c
branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_ops_call.h
branches/soc-2011-tomato/source/creator/blender.map
branches/soc-2011-tomato/source/creator/osx_locals.map
branches/soc-2011-tomato/source/tests/bl_rst_completeness.py
branches/soc-2011-tomato/source/tests/rst_to_doctree_mini.py
Removed Paths:
-------------
branches/soc-2011-tomato/extern/eltopo/
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/
branches/soc-2011-tomato/intern/locale/CMakeLists.txt
branches/soc-2011-tomato/intern/locale/SConscript
branches/soc-2011-tomato/intern/locale/boost_locale_wrapper.cpp
branches/soc-2011-tomato/intern/locale/boost_locale_wrapper.h
branches/soc-2011-tomato/release/darwin/blender.app/
branches/soc-2011-tomato/release/darwin/blender.app/Contents/
branches/soc-2011-tomato/release/darwin/blender.app/Contents/Info.plist
branches/soc-2011-tomato/release/darwin/blender.app/Contents/MacOS/
branches/soc-2011-tomato/release/darwin/blender.app/Contents/MacOS/blender
branches/soc-2011-tomato/release/darwin/blender.app/Contents/PkgInfo
branches/soc-2011-tomato/release/darwin/blender.app/Contents/Resources/
branches/soc-2011-tomato/release/darwin/blender.app/Contents/Resources/blender file icon.icns
branches/soc-2011-tomato/release/darwin/blender.app/Contents/Resources/blender icon.icns
branches/soc-2011-tomato/release/darwin/blenderplayer.app/
branches/soc-2011-tomato/release/darwin/blenderplayer.app/Contents/
branches/soc-2011-tomato/release/darwin/blenderplayer.app/Contents/Info.plist
branches/soc-2011-tomato/release/darwin/blenderplayer.app/Contents/MacOS/
branches/soc-2011-tomato/release/darwin/blenderplayer.app/Contents/MacOS/blenderplayer
branches/soc-2011-tomato/release/darwin/blenderplayer.app/Contents/PkgInfo
branches/soc-2011-tomato/release/darwin/blenderplayer.app/Contents/Resources/
branches/soc-2011-tomato/release/darwin/blenderplayer.app/Contents/Resources/blender file icon.icns
branches/soc-2011-tomato/release/darwin/blenderplayer.app/Contents/Resources/blender player icon.icns
branches/soc-2011-tomato/release/darwin/set_simulation_threads.app/
branches/soc-2011-tomato/release/darwin/set_simulation_threads.app/Contents/
branches/soc-2011-tomato/release/darwin/set_simulation_threads.app/Contents/Info.plist
branches/soc-2011-tomato/release/darwin/set_simulation_threads.app/Contents/MacOS/
branches/soc-2011-tomato/release/darwin/set_simulation_threads.app/Contents/MacOS/applet
branches/soc-2011-tomato/release/darwin/set_simulation_threads.app/Contents/PkgInfo
branches/soc-2011-tomato/release/darwin/set_simulation_threads.app/Contents/Resources/
branches/soc-2011-tomato/release/darwin/set_simulation_threads.app/Contents/Resources/Scripts/
branches/soc-2011-tomato/release/darwin/set_simulation_threads.app/Contents/Resources/Scripts/main.scpt
branches/soc-2011-tomato/release/darwin/set_simulation_threads.app/Contents/Resources/applet.icns
branches/soc-2011-tomato/release/darwin/set_simulation_threads.app/Contents/Resources/applet.rsrc
branches/soc-2011-tomato/release/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/
branches/soc-2011-tomato/release/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/TXT.rtf
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_decimate.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_decimate_collapse.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_decimate_dissolve.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_decimate_unsubdivide.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_bevel.c
branches/soc-2011-tomato/source/darwin/
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/build_files/build_environment/prepare_release_env.sh
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-51922
+ /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-52851
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2012-12-10 14:09:31 UTC (rev 52851)
+++ branches/soc-2011-tomato/CMakeLists.txt 2012-12-10 15:18:00 UTC (rev 52852)
@@ -127,7 +127,7 @@
option(WITH_BUILDINFO "Include extra build details (only disable for development & faster builds)" ON)
option(WITH_IK_ITASC "Enable ITASC IK solver (only disable for development & for incompatible C++ compilers)" ON)
option(WITH_IK_SOLVER "Enable Legacy IK solver (only disable for development)" ON)
-option(WITH_FFTW3 "Enable FFTW3 support (Used for smoke and audio effects)" OFF)
+option(WITH_FFTW3 "Enable FFTW3 support (Used for smoke and audio effects)" ON)
option(WITH_BULLET "Enable Bullet (Physics Engine)" ON)
option(WITH_GAMEENGINE "Enable Game Engine" ON)
option(WITH_PLAYER "Build Player" OFF)
@@ -190,8 +190,8 @@
option(WITH_MOD_SMOKE "Enable Smoke Modifier (Smoke Simulation)" ON)
option(WITH_MOD_BOOLEAN "Enable Boolean Modifier" ON)
option(WITH_MOD_REMESH "Enable Remesh Modifier" ON)
-option(WITH_MOD_CLOTH_ELTOPO "Enable Experimental cloth solver" OFF)
-mark_as_advanced(WITH_MOD_CLOTH_ELTOPO)
+# option(WITH_MOD_CLOTH_ELTOPO "Enable Experimental cloth solver" OFF) # this is now only available in a branch
+# mark_as_advanced(WITH_MOD_CLOTH_ELTOPO)
option(WITH_MOD_OCEANSIM "Enable Ocean Modifier" OFF)
# Image format support
@@ -234,17 +234,13 @@
option(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" ON)
if(UNIX AND NOT APPLE)
option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
+ option(WITH_STATIC_LIBS "Try to link with static libraries, as much as possible, to make blender more portable across distributions" OFF)
endif()
option(WITH_PYTHON_INSTALL "Copy system python into the blender install folder" ON)
option(WITH_PYTHON_INSTALL_NUMPY "Copy system numpy into the blender install folder" ON)
set(PYTHON_NUMPY_PATH "" CACHE PATH "Python to python site-packages or dist-packages containing 'numpy' module")
mark_as_advanced(PYTHON_NUMPY_PATH)
-if(MINGW)
- option(WITH_MINGW64 "Use the 64-bit version of MinGW" OFF)
- mark_as_advanced(WITH_MINGW64)
-endif()
-
# Cycles
option(WITH_CYCLES "Enable cycles Render Engine" ON)
option(WITH_CYCLES_TEST "Build cycles test application" OFF)
@@ -270,6 +266,9 @@
if(APPLE)
+ cmake_minimum_required(VERSION 2.8.8)
+ cmake_policy(VERSION 2.8.8)
+
if(NOT CMAKE_OSX_ARCHITECTURES)
set(CMAKE_OSX_ARCHITECTURES x86_64 CACHE STRING
"Choose the architecture you want to build Blender for: i386, x86_64 or ppc"
@@ -289,18 +288,14 @@
set(OSX_SYSTEM unsupported)
endif()
message(STATUS "Detected system-version: " ${OSX_SYSTEM})
-
- if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
- set(CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING "" FORCE) # 10.5 is our minimum target, if you have higher sdk, weak linking happens
- endif()
if(${CMAKE_GENERATOR} MATCHES "Xcode")
- ##### workaround for actual official cmake incompatibility with xcode 4.3 #####
+ ##### cmake incompatibility with xcode 4.3 and higher #####
if(${XCODE_VERSION} MATCHES '') # cmake fails due looking for xcode in the wrong path, thus will be empty var
- message("Official cmake does not yet support Xcode 4.3, get a patched version here: http://www.jensverwiebe.de/Blender/CMake%202.8-7patched.zip")
+ message(FATAL_ERROR "Xcode 4.3 and higher must be used with cmake 2.8-8 or higher")
endif()
- ### end workaround for actual official cmake incompatibility with xcode 4.3 ###
+ ### end cmake incompatibility with xcode 4.3 and higher ###
if(${XCODE_VERSION} VERSION_EQUAL 4 OR ${XCODE_VERSION} VERSION_GREATER 4 AND ${XCODE_VERSION} VERSION_LESS 4.3)
# Xcode 4 defaults to the Apple LLVM Compiler.
@@ -315,7 +310,28 @@
endif()
message(STATUS "Detected Xcode-version: " ${XCODE_VERSION})
+
+ if(${XCODE_VERSION} VERSION_LESS 4.3)
+ set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk CACHE PATH "" FORCE) # use guaranteed existing sdk
+ else()
+ # note: i don't use xcode-select path on purpose, cause also /Applications/Xcode.app would be allowed
+ # absolute pathes are more foolproof here !
+ set(OSX_SYSROOT_PREFIX /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform)
+ set(OSX_DEVELOPER_PREFIX /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk) # use guaranteed existing sdk
+ set(CMAKE_OSX_SYSROOT ${OSX_SYSROOT_PREFIX}/${OSX_DEVELOPER_PREFIX} CACHE PATH "" FORCE)
+ endif()
+ if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
+ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING "" FORCE) # 10.5 is our min. target, if you use higher sdk, weak linking happens
+ endif()
+
+ if(NOT ${CMAKE_GENERATOR} MATCHES "Xcode")
+ # force CMAKE_OSX_DEPLOYMENT_TARGET for makefiles, will not work else ( cmake bug ? )
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+ add_definitions ("-DMACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+ endif()
+
option(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" ON)
option(USE_QTKIT "Use QtKit instead of Carbon quicktime (needed for having partial quicktime for 64bit)" OFF)
option(WITH_LIBS10.5 "Use 10.5 libs (needed for 64bit builds)" OFF)
@@ -336,12 +352,20 @@
message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
endif()
-if(NOT WITH_AUDASPACE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK OR WITH_GAMEENGINE))
- message(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK/WITH_CODEC_FFMPEG/WITH_GAMEENGINE require WITH_AUDASPACE")
+if(NOT WITH_AUDASPACE)
+ if(WITH_OPENAL)
+ message(FATAL_ERROR "WITH_OPENAL requires WITH_AUDASPACE")
+ endif()
+ if(WITH_JACK)
+ message(FATAL_ERROR "WITH_JACK requires WITH_AUDASPACE")
+ endif()
+ if(WITH_GAMEENGINE)
+ message(FATAL_ERROR "WITH_GAMEENGINE requires WITH_AUDASPACE")
+ endif()
endif()
if(NOT WITH_SDL AND WITH_GHOST_SDL)
- message(FATAL_ERROR "WITH_GHOST_SDL requires WITH_SDL to be ON")
+ message(FATAL_ERROR "WITH_GHOST_SDL requires WITH_SDL")
endif()
if(WITH_IMAGE_REDCODE AND ((NOT WITH_IMAGE_OPENJPEG) OR (NOT WITH_CODEC_FFMPEG)))
@@ -358,10 +382,6 @@
endif()
-if(NOT WITH_FFTW3 AND WITH_MOD_OCEANSIM)
- message(FATAL_ERROR "WITH_MOD_OCEANSIM requires WITH_FFTW3 to be ON")
-endif()
-
# may as well build python module without a UI
if(WITH_PYTHON_MODULE)
set(WITH_HEADLESS ON)
@@ -372,8 +392,8 @@
set(WITH_OPENIMAGEIO ON)
endif()
-# auto enable boost for cycles and booleans
-if(WITH_CYCLES OR WITH_MOD_BOOLEAN)
+# 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)
endif()
@@ -461,14 +481,14 @@
# For alternate Python locations the commandline can be used to override detected/default cache settings, e.g:
# On Unix:
# cmake ../blender \
-# -D PYTHON_VERSION=3.2 \
-# -D PYTHON_INCLUDE_DIR=/opt/py32/include/python3.2d \
-# -D PYTHON_LIBRARY=/opt/py32/lib/libpython3.2d.so
+# -D PYTHON_VERSION=3.3 \
+# -D PYTHON_INCLUDE_DIR=/opt/py33/include/python3.3d \
+# -D PYTHON_LIBRARY=/opt/py33/lib/libpython3.3d.so
#
# On Macs:
# cmake ../blender \
-# -D PYTHON_INCLUDE_DIR=/System/Library/Frameworks/Python.framework/Versions/3.2/include/python3.2 \
-# -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/3.2/lib/python3.2/config \
+# -D PYTHON_INCLUDE_DIR=/System/Library/Frameworks/Python.framework/Versions/3.3/include/python3.3 \
+# -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/3.3/lib/python3.3/config \
# -G Xcode
#
# When changing any of this remember to update the notes in doc/build_systems/cmake.txt
@@ -477,50 +497,52 @@
#Platform specifics
if(UNIX AND NOT APPLE)
-
- # set lib directory if it exists
- if(CMAKE_SYSTEM_NAME MATCHES "Linux")
- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
- set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/linux64)
- else()
- set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/linux)
+ macro(find_package_wrapper)
+ STRING(TOUPPER ${ARGV0} _NAME_UPPER)
+ if(${WITH_STATIC_LIBS})
+ set(_cmake_find_library_suffixes_back ${CMAKE_FIND_LIBRARY_SUFFIXES})
+ set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
endif()
-
- if(NOT EXISTS ${LIBDIR})
- unset(LIBDIR)
+ find_package(${ARGV})
+ if(${WITH_STATIC_LIBS})
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ${_cmake_find_library_suffixes_back})
+ unset(_cmake_find_library_suffixes_back)
endif()
- endif()
+ endmacro()
- find_package(JPEG REQUIRED)
- find_package(PNG REQUIRED)
- find_package(ZLIB REQUIRED)
- find_package(Freetype REQUIRED)
+ find_package_wrapper(JPEG REQUIRED)
+ find_package_wrapper(PNG REQUIRED)
+ find_package_wrapper(ZLIB REQUIRED)
+ find_package_wrapper(Freetype REQUIRED)
if(WITH_PYTHON)
- # No way to set py32. remove for now.
+ # No way to set py33. remove for now.
# find_package(PythonLibs)
# Use our own instead, since wothout py is such a rare case,
# require this package
+ # XXX Linking errors with debian static python :/
+# find_package_wrapper(PythonLibsUnix REQUIRED)
find_package(PythonLibsUnix REQUIRED)
endif()
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list