[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54751] branches/soc-2011-tomato: Merging r54570 through r54750 from trunk into soc-2011-tomato

Sergey Sharybin sergey.vfx at gmail.com
Fri Feb 22 11:43:50 CET 2013


Revision: 54751
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54751
Author:   nazgul
Date:     2013-02-22 10:43:49 +0000 (Fri, 22 Feb 2013)
Log Message:
-----------
Merging r54570 through r54750 from trunk into soc-2011-tomato

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

Modified Paths:
--------------
    branches/soc-2011-tomato/CMakeLists.txt
    branches/soc-2011-tomato/build_files/buildbot/config/user-config-cuda-glibc211-i686.py
    branches/soc-2011-tomato/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py
    branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
    branches/soc-2011-tomato/build_files/scons/config/linux-config.py
    branches/soc-2011-tomato/build_files/scons/config/win32-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/doc/license/bf-members.txt
    branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py
    branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.sh
    branches/soc-2011-tomato/extern/libmv/CMakeLists.txt
    branches/soc-2011-tomato/extern/libmv/SConscript
    branches/soc-2011-tomato/extern/libmv/bundle.sh
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/CMakeLists.txt
    branches/soc-2011-tomato/extern/libmv/third_party/ceres/bundle.sh
    branches/soc-2011-tomato/intern/cycles/blender/addon/__init__.py
    branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py
    branches/soc-2011-tomato/intern/cycles/blender/blender_session.cpp
    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_network.cpp
    branches/soc-2011-tomato/intern/cycles/kernel/kernel_path.h
    branches/soc-2011-tomato/intern/cycles/render/light.cpp
    branches/soc-2011-tomato/intern/cycles/util/util_cuda.h
    branches/soc-2011-tomato/intern/cycles/util/util_dynlib.cpp
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_DropTargetWin32.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/smoke/intern/WAVELET_NOISE.h
    branches/soc-2011-tomato/intern/utfconv/utf_winfunc.c
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/bl_process_msg.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/bpy_extras/mesh_utils.py
    branches/soc-2011-tomato/release/scripts/modules/bpy_extras/object_utils.py
    branches/soc-2011-tomato/release/scripts/modules/rna_prop_ui.py
    branches/soc-2011-tomato/release/scripts/presets/interface_theme/back_to_black.xml
    branches/soc-2011-tomato/release/scripts/presets/interface_theme/blender_24x.xml
    branches/soc-2011-tomato/release/scripts/presets/interface_theme/elsyiun.xml
    branches/soc-2011-tomato/release/scripts/presets/interface_theme/hexagon.xml
    branches/soc-2011-tomato/release/scripts/presets/interface_theme/ubuntu_ambiance.xml
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/rigidbody.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_modifier.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_rigidbody.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_scene.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.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_node.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2011-tomato/source/blender/blenfont/BLF_translation.h
    branches/soc-2011-tomato/source/blender/blenfont/intern/blf.c
    branches/soc-2011-tomato/source/blender/blenfont/intern/blf_internal_types.h
    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_bmesh.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_deform.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_depsgraph.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_image.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_object.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_particle.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_rigidbody.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_tracking.h
    branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/anim.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/blender.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.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/deform.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/object.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/rigidbody.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/scene.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.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/blenlib/BLI_math_base.h
    branches/soc-2011-tomato/source/blender/blenlib/BLI_math_rotation.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/intern/BLI_heap.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_mempool.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_rotation.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/math_vector.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/scanfill.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/string.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/string_utf8.c
    branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-tomato/source/blender/bmesh/bmesh_class.h
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_opdefines.c
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operators.c
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_polygon.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/collada/AnimationImporter.cpp
    branches/soc-2011-tomato/source/blender/collada/ArmatureExporter.h
    branches/soc-2011-tomato/source/blender/collada/ArmatureImporter.cpp
    branches/soc-2011-tomato/source/blender/collada/DocumentImporter.cpp
    branches/soc-2011-tomato/source/blender/collada/SkinInfo.cpp
    branches/soc-2011-tomato/source/blender/collada/collada.cpp
    branches/soc-2011-tomato/source/blender/collada/collada.h
    branches/soc-2011-tomato/source/blender/collada/collada_internal.cpp
    branches/soc-2011-tomato/source/blender/collada/collada_internal.h
    branches/soc-2011-tomato/source/blender/collada/collada_utils.cpp
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_CompositorContext.h
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_GroupNode.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/editors/animation/anim_channels_defines.c
    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_ipo_utils.c
    branches/soc-2011-tomato/source/blender/editors/animation/drivers.c
    branches/soc-2011-tomato/source/blender/editors/animation/keyframing.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/poseobject.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/gpencil_paint.c
    branches/soc-2011-tomato/source/blender/editors/include/ED_anim_api.h
    branches/soc-2011-tomato/source/blender/editors/include/ED_object.h
    branches/soc-2011-tomato/source/blender/editors/include/ED_view3d.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_handlers.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_intern.h
    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/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_loopcut.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/meshtools.c
    branches/soc-2011-tomato/source/blender/editors/object/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/editors/object/SConscript
    branches/soc-2011-tomato/source/blender/editors/object/object_add.c
    branches/soc-2011-tomato/source/blender/editors/object/object_bake.c
    branches/soc-2011-tomato/source/blender/editors/object/object_constraint.c
    branches/soc-2011-tomato/source/blender/editors/object/object_edit.c
    branches/soc-2011-tomato/source/blender/editors/object/object_group.c
    branches/soc-2011-tomato/source/blender/editors/object/object_hook.c
    branches/soc-2011-tomato/source/blender/editors/object/object_intern.h
    branches/soc-2011-tomato/source/blender/editors/object/object_modifier.c
    branches/soc-2011-tomato/source/blender/editors/object/object_ops.c
    branches/soc-2011-tomato/source/blender/editors/object/object_relations.c
    branches/soc-2011-tomato/source/blender/editors/object/object_select.c
    branches/soc-2011-tomato/source/blender/editors/object/object_transform.c
    branches/soc-2011-tomato/source/blender/editors/physics/dynamicpaint_ops.c
    branches/soc-2011-tomato/source/blender/editors/physics/particle_boids.c
    branches/soc-2011-tomato/source/blender/editors/physics/particle_object.c
    branches/soc-2011-tomato/source/blender/editors/physics/rigidbody_constraint.c
    branches/soc-2011-tomato/source/blender/editors/physics/rigidbody_object.c
    branches/soc-2011-tomato/source/blender/editors/render/render_opengl.c
    branches/soc-2011-tomato/source/blender/editors/screen/area.c
    branches/soc-2011-tomato/source/blender/editors/screen/screen_ops.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2011-tomato/source/blender/editors/space_buttons/buttons_context.c
    branches/soc-2011-tomato/source/blender/editors/space_buttons/buttons_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/editors/space_clip/SConscript
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_buttons.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_editor.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_toolbar.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_graph/graph_buttons.c
    branches/soc-2011-tomato/source/blender/editors/space_image/image_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_info/info_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_info/info_stats.c
    branches/soc-2011-tomato/source/blender/editors/space_info/textview.c
    branches/soc-2011-tomato/source/blender/editors/space_info/textview.h
    branches/soc-2011-tomato/source/blender/editors/space_node/node_header.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_edit.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_tools.c
    branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2011-tomato/source/blender/editors/space_text/text_autocomplete.c
    branches/soc-2011-tomato/source/blender/editors/space_text/text_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_snap.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform.h
    branches/soc-2011-tomato/source/blender/editors/transform/transform_constraints.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_generics.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_orientations.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_snap.c
    branches/soc-2011-tomato/source/blender/editors/uvedit/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/editors/uvedit/SConscript
    branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_buttons.c
    branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_intern.h
    branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2011-tomato/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_material.glsl
    branches/soc-2011-tomato/source/blender/imbuf/intern/IMB_colormanagement_intern.h
    branches/soc-2011-tomato/source/blender/imbuf/intern/dds/dds_api.cpp
    branches/soc-2011-tomato/source/blender/imbuf/intern/iris.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/jp2.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/png.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/readimage.c
    branches/soc-2011-tomato/source/blender/makesdna/DNA_node_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_particle_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_rigidbody_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_world_types.h
    branches/soc-2011-tomato/source/blender/makesrna/intern/makesrna.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_boid.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_camera.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_dynamicpaint.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_fcurve.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_image.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_smoke.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_ui_api.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.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/nodes/shader/nodes/node_shader_brightness.c
    branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_compose.c
    branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_decompose.c
    branches/soc-2011-tomato/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_interface.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_props.c
    branches/soc-2011-tomato/source/blender/render/intern/source/bake.c
    branches/soc-2011-tomato/source/blender/render/intern/source/convertblender.c
    branches/soc-2011-tomato/source/blender/render/intern/source/multires_bake.c
    branches/soc-2011-tomato/source/blender/render/intern/source/pipeline.c
    branches/soc-2011-tomato/source/blender/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/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2011-tomato/source/creator/creator.c
    branches/soc-2011-tomato/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.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/KX_ConvertSensors.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_CharacterWrapper.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_ObjectActuator.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_RayCast.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_VehicleWrapper.h
    branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CcdGraphicController.cpp
    branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CcdGraphicController.h
    branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
    branches/soc-2011-tomato/source/gameengine/Physics/Dummy/CMakeLists.txt
    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/Dummy/SConscript
    branches/soc-2011-tomato/source/gameengine/Physics/common/CMakeLists.txt
    branches/soc-2011-tomato/source/gameengine/Physics/common/PHY_DynamicTypes.h
    branches/soc-2011-tomato/source/gameengine/Physics/common/PHY_ICharacter.h
    branches/soc-2011-tomato/source/gameengine/Physics/common/PHY_IGraphicController.h
    branches/soc-2011-tomato/source/gameengine/Physics/common/PHY_IPhysicsController.h
    branches/soc-2011-tomato/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
    branches/soc-2011-tomato/source/gameengine/Physics/common/PHY_IVehicle.h
    branches/soc-2011-tomato/source/tools/check_style_c.py
    branches/soc-2011-tomato/source/tools/spell_check_source_config.py

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


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

Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt	2013-02-22 10:13:15 UTC (rev 54750)
+++ branches/soc-2011-tomato/CMakeLists.txt	2013-02-22 10:43:49 UTC (rev 54751)
@@ -250,7 +250,7 @@
 option(WITH_CYCLES_TEST				"Build cycles test application" OFF)
 option(WITH_CYCLES_OSL				"Build Cycles with OSL support" OFF)
 option(WITH_CYCLES_CUDA_BINARIES	"Build cycles CUDA binaries" OFF)
-set(CYCLES_CUDA_BINARIES_ARCH sm_13 sm_20 sm_21 sm_30 CACHE STRING "CUDA architectures to build binaries for")
+set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 CACHE STRING "CUDA architectures to build binaries for")
 mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
 unset(PLATFORM_DEFAULT)
 

Modified: branches/soc-2011-tomato/build_files/buildbot/config/user-config-cuda-glibc211-i686.py
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/config/user-config-cuda-glibc211-i686.py	2013-02-22 10:13:15 UTC (rev 54750)
+++ branches/soc-2011-tomato/build_files/buildbot/config/user-config-cuda-glibc211-i686.py	2013-02-22 10:43:49 UTC (rev 54751)
@@ -2,4 +2,4 @@
 BF_INSTALLDIR = '../blender-install/linux-glibc211-i686'
 BF_NUMJOBS = 1
 
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']

Modified: branches/soc-2011-tomato/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py	2013-02-22 10:13:15 UTC (rev 54750)
+++ branches/soc-2011-tomato/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py	2013-02-22 10:43:49 UTC (rev 54751)
@@ -2,4 +2,4 @@
 BF_INSTALLDIR = '../blender-install/linux-glibc211-x86_64'
 BF_NUMJOBS = 1
 
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']

Modified: branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/darwin-config.py	2013-02-22 10:13:15 UTC (rev 54750)
+++ branches/soc-2011-tomato/build_files/scons/config/darwin-config.py	2013-02-22 10:43:49 UTC (rev 54751)
@@ -315,7 +315,7 @@
 
 WITH_BF_CYCLES_CUDA_BINARIES = False
 BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc'
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
 
 #Ray trace optimization
 if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'i386':

Modified: branches/soc-2011-tomato/build_files/scons/config/linux-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/linux-config.py	2013-02-22 10:13:15 UTC (rev 54750)
+++ branches/soc-2011-tomato/build_files/scons/config/linux-config.py	2013-02-22 10:43:49 UTC (rev 54751)
@@ -209,7 +209,7 @@
 
 WITH_BF_CYCLES_CUDA_BINARIES = False
 BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc'
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
 
 WITH_BF_OPENMP = True
 

Modified: branches/soc-2011-tomato/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/win32-mingw-config.py	2013-02-22 10:13:15 UTC (rev 54750)
+++ branches/soc-2011-tomato/build_files/scons/config/win32-mingw-config.py	2013-02-22 10:43:49 UTC (rev 54751)
@@ -174,7 +174,7 @@
 #CUDA
 WITH_BF_CYCLES_CUDA_BINARIES = False
 #BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
 
 ##
 CC = 'gcc'

Modified: branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py	2013-02-22 10:13:15 UTC (rev 54750)
+++ branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py	2013-02-22 10:43:49 UTC (rev 54751)
@@ -189,7 +189,7 @@
 #CUDA
 WITH_BF_CYCLES_CUDA_BINARIES = False
 #BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
 
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True

Modified: branches/soc-2011-tomato/build_files/scons/config/win64-mingw-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/win64-mingw-config.py	2013-02-22 10:13:15 UTC (rev 54750)
+++ branches/soc-2011-tomato/build_files/scons/config/win64-mingw-config.py	2013-02-22 10:43:49 UTC (rev 54751)
@@ -146,7 +146,7 @@
 WITH_BF_CYCLES = True
 WITH_BF_CYCLES_CUDA_BINARIES = False
 BF_CYCLES_CUDA_NVCC = "" # Path to the NVIDIA CUDA compiler
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
 
 WITH_BF_OIIO = True
 BF_OIIO = LIBDIR + '/openimageio'

Modified: branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py	2013-02-22 10:13:15 UTC (rev 54750)
+++ branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py	2013-02-22 10:43:49 UTC (rev 54751)
@@ -185,7 +185,7 @@
 #CUDA
 WITH_BF_CYCLES_CUDA_BINARIES = False
 #BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
 
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True

Modified: branches/soc-2011-tomato/doc/license/bf-members.txt
===================================================================
--- branches/soc-2011-tomato/doc/license/bf-members.txt	2013-02-22 10:13:15 UTC (rev 54750)
+++ branches/soc-2011-tomato/doc/license/bf-members.txt	2013-02-22 10:43:49 UTC (rev 54751)
@@ -35,7 +35,7 @@
 Christian Reichlin 
 brian moore 
 Anthony Walker 
-Carsten H\x9Afer 
+Carsten Höfer 
 Raymond Fordham 
 David Megginson 
 Jason Schmidt 
@@ -78,7 +78,7 @@
 DEBEUX Sylvain 
 Douglas Philips 
 Lai Che Hung
-Johan Bolmsj\x9A 
+Johan Bolmsjö 
 Aaron Mitchell 
 Teinye Horsfall 
 Martin Marbach 
@@ -98,7 +98,7 @@
 Dan Lyke 
 Mark Thorpe 
 A.D. Arul Nirai Selvan 
-Herbert P\x9Atzl 
+Herbert Pötzl 
 Andy Payne 
 LAFFITTE Benoit (KenjForce)
 James Ertle 
@@ -148,7 +148,7 @@
 Brice Due 
 Simon Vogl 
 Bernd Koestler 
-cl\x8Ement CORDIER 
+clément CORDIER 
 CreationAnimation.com
 Pete Carss 
 HERSEN Antoine 
@@ -197,9 +197,9 @@
 Ralf Pietersz 
 KAZY
 serge Jadot 
-Herv\x8E LOUINET 
+Hervé LOUINET 
 Tom Houtman 
-Magnus K\x9A\x9Ahler 
+Magnus Kööhler 
 Martin Sinnaeve 
 Kevin Yank 
 Tomoichi Iriyama 
@@ -221,12 +221,12 @@
 Naoki Abe 
 NOTTE Jean-Pierre 
 Jack Way 
-Bj\x9Arn Westlin 
+Björn Westlin 
 Mitch Magee 
 wizoptic
 Jake Edge 
 David Hoover 
-Xabier Go\x96i 
+Xabier Goñi 
 Daniel Fort 
 Erik Noteboom 
 Pavel Vostatek 
@@ -234,7 +234,7 @@
 Jeffrey Blank 
 Nathan Ryan 
 Peter Wrangell 
-Josef Sie\xA7 
+Josef Sieß 
 Timm Krumnack 
 Steve Martin 
 Shigeru Matsumoto 
@@ -261,7 +261,7 @@
 Sascha Adler 
 Stuart Duncan 
 Brendon Smith 
-S\x8Ebastien COLLETTE 
+Sébastien COLLETTE 
 Clemens Auer 
 Kay Fricke 
 Fabian Fagerholm 
@@ -282,7 +282,7 @@
 Jeff Cox 
 Trevor Ratliff 
 Matt Henley 
-Fran\x8Dois VALETTE 
+François VALETTE 
 Rob Saunders 
 Mike Luethi 
 Rami Aubourg-Kaires 
@@ -290,9 +290,9 @@
 Allan Jacobsen 
 Adam Lowe 
 David Hostetler 
-Lo\x95c Vigneras 
+Loïc Vigneras 
 Dan Reiland 
-Pedro D\x92az del Arco 
+Pedro Díaz del Arco 
 Pierre Beyssac 
 Chris Davey 
 YOSHIAKI Nishino 
@@ -385,7 +385,7 @@
 Holger Malessa 
 Masanori Okuda 
 Andrea Maracci 
-Kai-Peter B\x8Ackman 
+Kai-Peter Bäckman 
 Gregg Patton 
 Luis M Ibarra
 Julian Green 
@@ -394,7 +394,7 @@
 Ebbe L. Nielsen
 Carlos Orozco 
 magnetHead
-Kr\x9Fckel Oliver 
+Krückel Oliver 
 Thomas Ingham 
 Wes Devauld 
 Uwe Steinmann 
@@ -417,7 +417,7 @@
 NDNWarrior
 Christopher Gray 
 Darius Clarke (Socinian)
-Jean-S\x8Ebastien SEVESTRE 
+Jean-Sébastien SEVESTRE 
 Douglas Fellows 
 Craig Symons 
 Quincin Gonjon 
@@ -447,7 +447,7 @@
 Christoher Bartak 
 Peter Truog 
 Eric Dynowski 
-Philipp G\x9Fhring 
+Philipp Gühring 
 Pierre-Yves RANNO 
 Jason Nollan (Cluh)
 Launay Jean-Claude 
@@ -465,7 +465,7 @@
 David Polston 
 Patrick Mullen 
 Tetsuya Okuno 
-Bodo J\x8Ager 
+Bodo Jäger 
 Leon Brooks 
 Cedric Adjih 
 Michael L. Fisher
@@ -521,7 +521,7 @@
 Adrian Virnig 
 Chris Dixon 
 Travis Cole 
-M\x8Crten M\x8Crtensson 
+Mårten Mårtensson 
 Evan Scott 
 Mark Coletti 
 Ken Burke 
@@ -541,7 +541,7 @@
 Thomas Bleicher 
 Anthony Zishka 
 Jefferson Dubrule 
-Esa Piiril\x8A 
+Esa Piirilä 
 Bill Thiede 
 William Anderson 
 Alexander Kittel 
@@ -561,7 +561,7 @@
 John Miller 
 Frederic Crozat 
 Matt Welland 
-Paul Calc\x8E 
+Paul Calcé 
 Joe Prochilo 
 Justin Shafer 
 Joe Croft 
@@ -571,7 +571,7 @@
 Phuoc Ngo 
 Krabat
 Derek Harmison 
-S\x8Ebastien Devine 
+Sébastien Devine 
 Kenneth P. Stox
 Wade Felde 
 Kai Groshert 
@@ -603,7 +603,7 @@
 Guillermina Manon 
 Randal D. Adams
 Kevin Reagh (kevin3D)
-Wolfgang K\x9Fhn 
+Wolfgang Kühn 
 BEAUSOLEIL Arnaud 
 Stan Jakubek 
 Klaus Brand 

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list