[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53625] branches/soc-2011-tomato: Merging r53212 through r53624 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Mon Jan 7 12:01:06 CET 2013
Revision: 53625
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53625
Author: nazgul
Date: 2013-01-07 11:01:03 +0000 (Mon, 07 Jan 2013)
Log Message:
-----------
Merging r53212 through r53624 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53212
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53624
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/SConstruct
branches/soc-2011-tomato/build_files/build_environment/install_deps.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/cmake/Modules/FindOpenCOLLADA.cmake
branches/soc-2011-tomato/build_files/cmake/cmake_consistency_check.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/cmake/project_source_info.py
branches/soc-2011-tomato/build_files/package_spec/rpm/blender.spec.in
branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
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/sphinx_doc_gen.py
branches/soc-2011-tomato/extern/CMakeLists.txt
branches/soc-2011-tomato/extern/SConscript
branches/soc-2011-tomato/extern/carve/patches/mingw_w64.patch
branches/soc-2011-tomato/extern/libopenjpeg/patches/osx.patch
branches/soc-2011-tomato/intern/cycles/CMakeLists.txt
branches/soc-2011-tomato/intern/cycles/app/cycles_server.cpp
branches/soc-2011-tomato/intern/cycles/blender/CMakeLists.txt
branches/soc-2011-tomato/intern/cycles/blender/addon/__init__.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_mesh.cpp
branches/soc-2011-tomato/intern/cycles/blender/blender_object.cpp
branches/soc-2011-tomato/intern/cycles/blender/blender_session.cpp
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/bvh/bvh.cpp
branches/soc-2011-tomato/intern/cycles/bvh/bvh.h
branches/soc-2011-tomato/intern/cycles/bvh/bvh_build.cpp
branches/soc-2011-tomato/intern/cycles/bvh/bvh_build.h
branches/soc-2011-tomato/intern/cycles/bvh/bvh_params.h
branches/soc-2011-tomato/intern/cycles/bvh/bvh_sort.cpp
branches/soc-2011-tomato/intern/cycles/bvh/bvh_split.cpp
branches/soc-2011-tomato/intern/cycles/device/CMakeLists.txt
branches/soc-2011-tomato/intern/cycles/device/device.h
branches/soc-2011-tomato/intern/cycles/device/device_cuda.cpp
branches/soc-2011-tomato/intern/cycles/device/device_network.cpp
branches/soc-2011-tomato/intern/cycles/device/device_network.h
branches/soc-2011-tomato/intern/cycles/kernel/CMakeLists.txt
branches/soc-2011-tomato/intern/cycles/kernel/kernel_bvh.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_compat_cuda.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_compat_opencl.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_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_shader.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_textures.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/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/stdosl.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_attribute.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_geometry.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_tex_coord.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_types.h
branches/soc-2011-tomato/intern/cycles/render/CMakeLists.txt
branches/soc-2011-tomato/intern/cycles/render/attribute.cpp
branches/soc-2011-tomato/intern/cycles/render/attribute.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/mesh.h
branches/soc-2011-tomato/intern/cycles/render/mesh_displace.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/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/subd/subd_dice.cpp
branches/soc-2011-tomato/intern/cycles/util/CMakeLists.txt
branches/soc-2011-tomato/intern/cycles/util/util_boundbox.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_transform.h
branches/soc-2011-tomato/intern/cycles/util/util_types.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowWin32.h
branches/soc-2011-tomato/intern/locale/boost_locale_wrapper.cpp
branches/soc-2011-tomato/intern/smoke/CMakeLists.txt
branches/soc-2011-tomato/intern/tools/credits_svn_gen.py
branches/soc-2011-tomato/release/darwin/blender.app/Contents/MacOS/blender
branches/soc-2011-tomato/release/darwin/blenderplayer.app/Contents/MacOS/blenderplayer
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/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/bpy/path.py
branches/soc-2011-tomato/release/scripts/modules/bpy_extras/anim_utils.py
branches/soc-2011-tomato/release/scripts/modules/bpy_extras/object_utils.py
branches/soc-2011-tomato/release/scripts/modules/bpy_types.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/anim.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/node.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/uvcalc_follow_active.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/__init__.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_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_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_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_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/startup/keyingsets_builtins.py
branches/soc-2011-tomato/source/blender/avi/intern/avi_endian.c
branches/soc-2011-tomato/source/blender/avi/intern/avi_intern.h
branches/soc-2011-tomato/source/blender/avi/intern/avi_mjpeg.c
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/blenkernel/BKE_blender.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_brush.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_constraint.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_deform.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_displist.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_global.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_idprop.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_image.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_key.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_mesh.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_node.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_pbvh.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_screen.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_shrinkwrap.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_suggestions.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_text.h
branches/soc-2011-tomato/source/blender/blenkernel/CMakeLists.txt
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/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/booleanops_mesh.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/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/constraint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/context.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/fcurve.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/key.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/lattice.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/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/packedFile.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/paint.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/pointcache.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/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/texture.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_array.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_path_util.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_scanfill.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_kdopbvh.c
branches/soc-2011-tomato/source/blender/blenlib/intern/jitter.c
branches/soc-2011-tomato/source/blender/blenlib/intern/math_base_inline.c
branches/soc-2011-tomato/source/blender/blenlib/intern/math_color.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_vector_inline.c
branches/soc-2011-tomato/source/blender/blenlib/intern/path_util.c
branches/soc-2011-tomato/source/blender/blenlib/intern/scanfill.c
branches/soc-2011-tomato/source/blender/blenloader/CMakeLists.txt
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/readfile.h
branches/soc-2011-tomato/source/blender/blenloader/intern/versioning_250.c
branches/soc-2011-tomato/source/blender/blenloader/intern/versioning_legacy.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/SConscript
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_interp.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_marking.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mesh.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_queries.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_queries.h
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_bevel.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_extrude.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_smooth_laplacian.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_symmetrize.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_collapse.c
branches/soc-2011-tomato/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.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/ImageExporter.cpp
branches/soc-2011-tomato/source/blender/collada/MeshImporter.cpp
branches/soc-2011-tomato/source/blender/compositor/CMakeLists.txt
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystem.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_NodeOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_NodeOperation.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_OpenCLDevice.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_OutputFileOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_TrackPositionOperation.cpp
branches/soc-2011-tomato/source/blender/editors/animation/anim_filter.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_ops.c
branches/soc-2011-tomato/source/blender/editors/animation/fmodifier_ui.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/editarmature_retarget.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/armature/reeb.c
branches/soc-2011-tomato/source/blender/editors/curve/editcurve.c
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_interface_icons.h
branches/soc-2011-tomato/source/blender/editors/include/UI_resources.h
branches/soc-2011-tomato/source/blender/editors/include/UI_view2d.h
branches/soc-2011-tomato/source/blender/editors/interface/interface.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_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/mesh/editface.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_knife.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_navmesh.c
branches/soc-2011-tomato/source/blender/editors/mesh/meshtools.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_lattice.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_select.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/particle_object.c
branches/soc-2011-tomato/source/blender/editors/physics/physics_fluid.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/screen/area.c
branches/soc-2011-tomato/source/blender/editors/screen/screen_edit.c
branches/soc-2011-tomato/source/blender/editors/screen/screendump.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_hide.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_mask.c
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_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/sculpt_paint/sculpt_undo.c
branches/soc-2011-tomato/source/blender/editors/space_action/action_draw.c
branches/soc-2011-tomato/source/blender/editors/space_action/space_action.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/space_clip.c
branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_select.c
branches/soc-2011-tomato/source/blender/editors/space_file/file_draw.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_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_stats.c
branches/soc-2011-tomato/source/blender/editors/space_info/space_info.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_node/drawnode.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_view.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_intern.h
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_tools.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/sequencer_add.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_edit.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_draw.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_py.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_userpref/space_userpref.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_draw.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_intern.h
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_view.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.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_orientations.c
branches/soc-2011-tomato/source/blender/editors/util/undo.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_intern.h
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/CMakeLists.txt
branches/soc-2011-tomato/source/blender/gpu/GPU_buffers.h
branches/soc-2011-tomato/source/blender/gpu/SConscript
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_buffers.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/ikplugin/intern/iksolver_plugin.c
branches/soc-2011-tomato/source/blender/ikplugin/intern/itasc_plugin.cpp
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/intern/IMB_filter.h
branches/soc-2011-tomato/source/blender/imbuf/intern/IMB_metadata.h
branches/soc-2011-tomato/source/blender/imbuf/intern/cineon/cineon_dpx.c
branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c
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/imageprocess.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/png.c
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/scaling.c
branches/soc-2011-tomato/source/blender/imbuf/intern/tiff.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_ID.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_armature_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_mesh_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_sequence_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_text_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_texture_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_view2d_types.h
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/intern/makesrna.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_animation.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_armature.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_brush.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_camera.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_define.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_image.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_internal_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_lamp.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_movieclip.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_pose.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_render.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_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.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_world.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_ocean.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_shapekey.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_weightvgmix.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_weightvgproximity.c
branches/soc-2011-tomato/source/blender/nodes/CMakeLists.txt
branches/soc-2011-tomato/source/blender/nodes/NOD_shader.h
branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_util.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_lensdist.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_outputFile.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/shader/node_shader_util.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_common.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_mapping.c
branches/soc-2011-tomato/source/blender/python/BPY_extern.h
branches/soc-2011-tomato/source/blender/python/SConscript
branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_api.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/generic/py_capi_utils.h
branches/soc-2011-tomato/source/blender/python/intern/CMakeLists.txt
branches/soc-2011-tomato/source/blender/python/intern/bpy.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_app_build_options.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_app_ffmpeg.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_driver.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_interface.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_interface_atexit.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_library.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_operator.c
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.h
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/intern/bpy_util.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_util.h
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2011-tomato/source/blender/render/extern/include/RE_engine.h
branches/soc-2011-tomato/source/blender/render/intern/include/render_result.h
branches/soc-2011-tomato/source/blender/render/intern/include/render_types.h
branches/soc-2011-tomato/source/blender/render/intern/include/renderdatabase.h
branches/soc-2011-tomato/source/blender/render/intern/raytrace/rayobject_instance.cpp
branches/soc-2011-tomato/source/blender/render/intern/raytrace/rayobject_octree.cpp
branches/soc-2011-tomato/source/blender/render/intern/source/convertblender.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/occlusion.c
branches/soc-2011-tomato/source/blender/render/intern/source/pipeline.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/shadeoutput.c
branches/soc-2011-tomato/source/blender/render/intern/source/strand.c
branches/soc-2011-tomato/source/blender/render/intern/source/volume_precache.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.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_apple.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_init_exit.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.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/BL_KetsjiEmbedStart.cpp
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/Converter/BL_ArmatureObject.cpp
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_BlenderSceneConverter.h
branches/soc-2011-tomato/source/gameengine/Converter/KX_ConvertControllers.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/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/soc-2011-tomato/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_2DFilterActuator.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_JoystickManager.cpp
branches/soc-2011-tomato/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
branches/soc-2011-tomato/source/gameengine/GamePlayer/common/GPC_Canvas.h
branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2011-tomato/source/gameengine/GamePlayer/xembed/UnixShell.c
branches/soc-2011-tomato/source/gameengine/Ketsji/CMakeLists.txt
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_ISceneConverter.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_Light.h
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_Scene.cpp
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/common/PHY_ICharacter.h
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_ICanvas.h
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
branches/soc-2011-tomato/source/tests/check_deprecated.py
branches/soc-2011-tomato/source/tools/check_style_c.py
Added Paths:
-----------
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/sculpt.org
branches/soc-2011-tomato/extern/rangetree/
branches/soc-2011-tomato/extern/rangetree/CMakeLists.txt
branches/soc-2011-tomato/extern/rangetree/README.org
branches/soc-2011-tomato/extern/rangetree/SConscript
branches/soc-2011-tomato/extern/rangetree/range_tree.hh
branches/soc-2011-tomato/extern/rangetree/range_tree_c_api.cc
branches/soc-2011-tomato/extern/rangetree/range_tree_c_api.h
branches/soc-2011-tomato/intern/cycles/blender/blender_curves.cpp
branches/soc-2011-tomato/intern/cycles/kernel/kernel_curve.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_primitive.h
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_hair_info.osl
branches/soc-2011-tomato/intern/cycles/render/curves.cpp
branches/soc-2011-tomato/intern/cycles/render/curves.h
branches/soc-2011-tomato/release/scripts/templates_osl/
branches/soc-2011-tomato/release/scripts/templates_osl/empty_shader.osl
branches/soc-2011-tomato/release/scripts/templates_osl/noise.osl
branches/soc-2011-tomato/release/scripts/templates_osl/wireframe.osl
branches/soc-2011-tomato/release/scripts/templates_py/
branches/soc-2011-tomato/release/scripts/templates_py/addon_add_object.py
branches/soc-2011-tomato/release/scripts/templates_py/background_job.py
branches/soc-2011-tomato/release/scripts/templates_py/batch_export.py
branches/soc-2011-tomato/release/scripts/templates_py/bmesh_simple.py
branches/soc-2011-tomato/release/scripts/templates_py/bmesh_simple_editmode.py
branches/soc-2011-tomato/release/scripts/templates_py/builtin_keyingset.py
branches/soc-2011-tomato/release/scripts/templates_py/driver_functions.py
branches/soc-2011-tomato/release/scripts/templates_py/gamelogic.py
branches/soc-2011-tomato/release/scripts/templates_py/gamelogic_module.py
branches/soc-2011-tomato/release/scripts/templates_py/gamelogic_simple.py
branches/soc-2011-tomato/release/scripts/templates_py/operator_file_export.py
branches/soc-2011-tomato/release/scripts/templates_py/operator_file_import.py
branches/soc-2011-tomato/release/scripts/templates_py/operator_mesh_add.py
branches/soc-2011-tomato/release/scripts/templates_py/operator_modal.py
branches/soc-2011-tomato/release/scripts/templates_py/operator_modal_draw.py
branches/soc-2011-tomato/release/scripts/templates_py/operator_modal_timer.py
branches/soc-2011-tomato/release/scripts/templates_py/operator_modal_view3d.py
branches/soc-2011-tomato/release/scripts/templates_py/operator_modal_view3d_raycast.py
branches/soc-2011-tomato/release/scripts/templates_py/operator_node.py
branches/soc-2011-tomato/release/scripts/templates_py/operator_simple.py
branches/soc-2011-tomato/release/scripts/templates_py/operator_uv.py
branches/soc-2011-tomato/release/scripts/templates_py/script_stub.py
branches/soc-2011-tomato/release/scripts/templates_py/ui_list.py
branches/soc-2011-tomato/release/scripts/templates_py/ui_menu.py
branches/soc-2011-tomato/release/scripts/templates_py/ui_menu_simple.py
branches/soc-2011-tomato/release/scripts/templates_py/ui_panel.py
branches/soc-2011-tomato/release/scripts/templates_py/ui_panel_simple.py
branches/soc-2011-tomato/source/blender/blenkernel/BKE_addon.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/addon.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/pbvh_bmesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/pbvh_intern.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_buffer.h
branches/soc-2011-tomato/source/blender/blenlib/intern/buffer.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_log.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_log.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertPremulToStraightOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertPremulToStraightOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertStraightToPremulOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertStraightToPremulOperation.h
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image_2d.c
branches/soc-2011-tomato/source/blender/editors/space_text/text_autocomplete.c
branches/soc-2011-tomato/source/blender/editors/space_text/text_format_osl.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_hair_info.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_path.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_path.h
branches/soc-2011-tomato/source/gameengine/Converter/KX_LibLoadStatus.cpp
branches/soc-2011-tomato/source/gameengine/Converter/KX_LibLoadStatus.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_PythonJoystick.cpp
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_PythonJoystick.h
Removed Paths:
-------------
branches/soc-2011-tomato/extern/rangetree/CMakeLists.txt
branches/soc-2011-tomato/extern/rangetree/README.org
branches/soc-2011-tomato/extern/rangetree/SConscript
branches/soc-2011-tomato/extern/rangetree/range_tree.hh
branches/soc-2011-tomato/extern/rangetree/range_tree_c_api.cc
branches/soc-2011-tomato/extern/rangetree/range_tree_c_api.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_attribute.h
branches/soc-2011-tomato/intern/cycles/util/util_attribute.cpp
branches/soc-2011-tomato/intern/cycles/util/util_attribute.h
branches/soc-2011-tomato/release/scripts/templates/
branches/soc-2011-tomato/release/scripts/templates_osl/empty_shader.osl
branches/soc-2011-tomato/release/scripts/templates_osl/noise.osl
branches/soc-2011-tomato/release/scripts/templates_osl/wireframe.osl
branches/soc-2011-tomato/release/scripts/templates_py/addon_add_object.py
branches/soc-2011-tomato/release/scripts/templates_py/background_job.py
branches/soc-2011-tomato/release/scripts/templates_py/batch_export.py
branches/soc-2011-tomato/release/scripts/templates_py/bmesh_simple.py
branches/soc-2011-tomato/release/scripts/templates_py/bmesh_simple_editmode.py
branches/soc-2011-tomato/release/scripts/templates_py/builtin_keyingset.py
branches/soc-2011-tomato/release/scripts/templates_py/driver_functions.py
branches/soc-2011-tomato/release/scripts/templates_py/gamelogic.py
branches/soc-2011-tomato/release/scripts/templates_py/gamelogic_module.py
branches/soc-2011-tomato/release/scripts/templates_py/gamelogic_simple.py
branches/soc-2011-tomato/release/scripts/templates_py/operator_file_export.py
branches/soc-2011-tomato/release/scripts/templates_py/operator_file_import.py
branches/soc-2011-tomato/release/scripts/templates_py/operator_mesh_add.py
branches/soc-2011-tomato/release/scripts/templates_py/operator_modal.py
branches/soc-2011-tomato/release/scripts/templates_py/operator_modal_draw.py
branches/soc-2011-tomato/release/scripts/templates_py/operator_modal_timer.py
branches/soc-2011-tomato/release/scripts/templates_py/operator_modal_view3d.py
branches/soc-2011-tomato/release/scripts/templates_py/operator_modal_view3d_raycast.py
branches/soc-2011-tomato/release/scripts/templates_py/operator_node.py
branches/soc-2011-tomato/release/scripts/templates_py/operator_simple.py
branches/soc-2011-tomato/release/scripts/templates_py/operator_uv.py
branches/soc-2011-tomato/release/scripts/templates_py/script_stub.py
branches/soc-2011-tomato/release/scripts/templates_py/ui_list.py
branches/soc-2011-tomato/release/scripts/templates_py/ui_menu.py
branches/soc-2011-tomato/release/scripts/templates_py/ui_menu_simple.py
branches/soc-2011-tomato/release/scripts/templates_py/ui_panel.py
branches/soc-2011-tomato/release/scripts/templates_py/ui_panel_simple.py
branches/soc-2011-tomato/source/blender/blenloader/BLO_soundfile.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.h
branches/soc-2011-tomato/source/blender/editors/space_text/text_python.c
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/extern/carve/patches/mingw_w64.patch
branches/soc-2011-tomato/extern/libopenjpeg/patches/osx.patch
branches/soc-2011-tomato/release/darwin/blender.app/Contents/MacOS/blender
branches/soc-2011-tomato/release/darwin/blenderplayer.app/Contents/MacOS/blenderplayer
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-53211
+ /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-53624
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2013-01-07 07:56:54 UTC (rev 53624)
+++ branches/soc-2011-tomato/CMakeLists.txt 2013-01-07 11:01:03 UTC (rev 53625)
@@ -129,6 +129,8 @@
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)" ON)
option(WITH_BULLET "Enable Bullet (Physics Engine)" ON)
+option(WITH_SYSTEM_BULLET "Use the systems bullet library (currently unsupported due to missing features in upstream!)" )
+mark_as_advanced(WITH_SYSTEM_BULLET)
option(WITH_GAMEENGINE "Enable Game Engine" ON)
option(WITH_PLAYER "Build Player" OFF)
option(WITH_OPENCOLORIO "Enable OpenColorIO color management" ON)
@@ -149,7 +151,10 @@
option(WITH_AUDASPACE "Build with blenders audio library (only disable if you know what you're doing!)" ON)
mark_as_advanced(WITH_AUDASPACE)
+option(WITH_BOOL_COMPAT "Continue defining \"TRUE\" and \"FALSE\" until these can be replaced with \"true\" and \"false\" from stdbool.h" ON)
+mark_as_advanced(WITH_BOOL_COMPAT)
+
# (unix defaults to OpenMP On)
if((UNIX AND NOT APPLE) OR (MINGW))
set(PLATFORM_DEFAULT ON)
@@ -264,7 +269,6 @@
option(WITH_ASSERT_ABORT "Call abort() when raising an assertion through BLI_assert()" OFF)
mark_as_advanced(WITH_ASSERT_ABORT)
-
if(APPLE)
cmake_minimum_required(VERSION 2.8.8)
cmake_policy(VERSION 2.8.8)
@@ -423,6 +427,13 @@
TEST_SSE_SUPPORT(COMPILER_SSE_FLAG COMPILER_SSE2_FLAG)
+TEST_STDBOOL_SUPPORT()
+if(HAVE_STDBOOL_H)
+ add_definitions(-DHAVE_STDBOOL_H)
+endif()
+if(WITH_BOOL_COMPAT)
+ add_definitions(-DWITH_BOOL_COMPAT)
+endif()
#-----------------------------------------------------------------------------
# Check for valid directories
@@ -1087,14 +1098,16 @@
if(WITH_PYTHON)
# normally cached but not since we include them with blender
if(MSVC10)
- set(PYTHON_VERSION 3.2) # CACHE STRING)
+ set(PYTHON_VERSION 3.3) # CACHE STRING)
else()
set(PYTHON_VERSION 3.3) # CACHE STRING)
endif()
set_lib_path(PYTHON "python")
STRING(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
- set(PYTHON_LIBRARY ${PYTHON}/lib/python${_PYTHON_VERSION_NO_DOTS}.lib) #CACHE FILEPATH
+ # Use shared libs for vc2008 and vc2010 until we actually have vc2010 libs
+ set(PYTHON_LIBRARY ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}.lib)
+ # set(PYTHON_LIBRARY ${PYTHON}/lib/python${_PYTHON_VERSION_NO_DOTS}.lib) #CACHE FILEPATH
unset(_PYTHON_VERSION_NO_DOTS)
#Shared includes for both vc2008 and vc2010
@@ -1833,7 +1846,21 @@
set(GLEW_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/extern/glew/include")
endif()
+
#-----------------------------------------------------------------------------
+# Configure Bullet
+
+if(WITH_BULLET AND WITH_SYSTEM_BULLET)
+ find_package(Bullet)
+ if(NOT BULLET_FOUND)
+ set(WITH_BULLET OFF)
+ endif()
+else()
+ set(BULLET_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/extern/bullet2/src")
+ # set(BULLET_LIBRARIES "")
+endif()
+
+#-----------------------------------------------------------------------------
# Configure Python.
if(WITH_PYTHON_MODULE)
@@ -2137,3 +2164,8 @@
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-01-07 07:56:54 UTC (rev 53624)
+++ branches/soc-2011-tomato/SConstruct 2013-01-07 11:01:03 UTC (rev 53625)
@@ -373,9 +373,10 @@
else:
env['CPPFLAGS'].append('-D__LITTLE_ENDIAN__')
-# TODO, make optional
+# TODO, make optional (as with CMake)
env['CPPFLAGS'].append('-DWITH_AUDASPACE')
env['CPPFLAGS'].append('-DWITH_AVI')
+env['CPPFLAGS'].append('-DWITH_BOOL_COMPAT')
# lastly we check for root_build_dir ( we should not do before, otherwise we might do wrong builddir
B.root_build_dir = env['BF_BUILDDIR']
@@ -442,11 +443,12 @@
found_pyconfig_h = True
if not (found_python_h and found_pyconfig_h):
- print("\nMissing: Python.h and/or pyconfig.h in\"" + env.subst('${BF_PYTHON_INC}') + "\",\n"
- " Set 'BF_PYTHON_INC' to point "
- "to valid python include path(s).\n Containing "
- "Python.h and pyconfig.h for python version \"" + env.subst('${BF_PYTHON_VERSION}') + "\"")
+ print("""\nMissing: Python.h and/or pyconfig.h in "%s"
+ Set 'BF_PYTHON_INC' to point to valid include path(s),
+ containing Python.h and pyconfig.h for Python version "%s".
+ Example: python scons/scons.py BF_PYTHON_INC=../Python/include
+ """ % (env.subst('${BF_PYTHON_INC}'), env.subst('${BF_PYTHON_VERSION}')))
Exit()
Modified: branches/soc-2011-tomato/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2011-tomato/build_files/build_environment/install_deps.sh 2013-01-07 07:56:54 UTC (rev 53624)
+++ branches/soc-2011-tomato/build_files/build_environment/install_deps.sh 2013-01-07 11:01:03 UTC (rev 53625)
@@ -1,16 +1,37 @@
-#!/bin/bash
+#!/usr/bin/env bash
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ##### END GPL LICENSE BLOCK #####
+# A shell script installing/building all needed dependencies to build Blender, for some Linux distributions.
+
# Parse command line!
ARGS=$( \
getopt \
-o s:i:t:h \
---long source:,install:,threads:,help,with-all,with-osl,all-static,force-all,force-python,\
-force-boost,force-ocio,force-oiio,force-llvm,force-osl,force-ffmpeg,\
-skip-python,skip-boost,skip-ocio,skip-oiio,skip-llvm,skip-osl,skip-ffmpeg \
+--long source:,install:,threads:,help,with-all,with-osl,with-opencollada,all-static,force-all,\
+force-python,force-numpy,force-boost,force-ocio,force-oiio,force-llvm,force-osl,force-opencollada,\
+force-ffmpeg,skip-python,skip-numpy,skip-boost,skip-ocio,skip-oiio,skip-llvm,skip-osl,skip-ffmpeg,\
+skip-opencollada \
-- "$@" \
)
DISTRO=""
+RPM=""
SRC="$HOME/src/blender-deps"
INST="/opt/lib"
CWD=$PWD
@@ -21,6 +42,9 @@
# Do not yet enable osl, use --with-osl (or --with-all) option to try it.
WITH_OSL=false
+# Do not yet enable opencollada, use --with-opencollada (or --with-all) option to try it.
+WITH_OPENCOLLADA=false
+
# Try to link everything statically. Use this to produce portable versions of blender.
ALL_STATIC=false
@@ -37,8 +61,12 @@
Number of threads for building: \$THREADS (automatically detected, use --threads=<nbr> to override it).
Full install: \$WITH_ALL (use --with-all option to enable it).
Building OSL: \$WITH_OSL (use --with-osl option to enable it).
+Building OpenCOLLADA: \$WITH_OPENCOLLADA (use --with-opencollada option to enable it).
All static linking: \$ALL_STATIC (use --all-static option to enable it).
+Example:
+Full install without OpenCOLLADA: --with-all --skip-opencollada
+
Use --help to show all available options!\""
ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
@@ -64,6 +92,9 @@
Try to install or build the OpenShadingLanguage libraries (and their dependencies).
Still experimental!
+ --with-opencollada
+ Build and install the OpenCOLLADA libraries.
+
--all-static
Build libraries as statically as possible, to create static builds of Blender.
@@ -73,6 +104,9 @@
--force-python
Force the rebuild of Python.
+ --force-numpy
+ Force the rebuild of NumPy.
+
--force-boost
Force the rebuild of Boost.
@@ -88,6 +122,9 @@
--force-osl
Force the rebuild of OpenShadingLanguage.
+ --force-opencollada
+ Force the rebuild of OpenCOLLADA.
+
--force-ffmpeg
Force the rebuild of FFMpeg.
@@ -101,6 +138,9 @@
--skip-python
Unconditionally skip Python installation/building.
+ --skip-numpy
+ Unconditionally skip NumPy installation/building.
+
--skip-boost
Unconditionally skip Boost installation/building.
@@ -116,6 +156,9 @@
--skip-osl
Unconditionally skip OpenShadingLanguage installation/building.
+ --skip-opencollada
+ Unconditionally skip OpenCOLLADA installation/building.
+
--skip-ffmpeg
Unconditionally skip FFMpeg installation/building.\""
@@ -125,6 +168,13 @@
PYTHON_FORCE_REBUILD=false
PYTHON_SKIP=false
+#Could not get numpy-1.6.2 to compile with python-3.3
+NUMPY_VERSION="1.7.0rc1"
+NUMPY_VERSION_MIN="1.7"
+NUMPY_SOURCE="http://sourceforge.net/projects/numpy/files/NumPy/$NUMPY_VERSION/numpy-$NUMPY_VERSION.tar.gz"
+NUMPY_FORCE_REBUILD=false
+NUMPY_SKIP=false
+
BOOST_VERSION="1.51.0"
_boost_version_nodots=`echo "$BOOST_VERSION" | sed -r 's/\./_/g'`
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list