svn merge ^/trunk/blender -r40587:40643
authorCampbell Barton <ideasman42@gmail.com>
Wed, 28 Sep 2011 07:34:48 +0000 (07:34 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 28 Sep 2011 07:34:48 +0000 (07:34 +0000)
commit4a157de23d43c22abec8bd6922f0355334e413f8
treec8ca75fef261ce1316ea9042aa4bd689aa4eb584
parentdbdb58f2a3c0d086afabdacab40c4d83c79e1a04
parentbc593cac2354c863f074d9d51cffb3dca9f499a3
svn merge ^/trunk/blender -r40587:40643
34 files changed:
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/BME_structure.c
source/blender/blenkernel/intern/BME_tools.c
source/blender/blenkernel/intern/collision.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/displist.c
source/blender/blenkernel/intern/idcode.c
source/blender/blenkernel/intern/object.c
source/blender/blenlib/BLI_callbacks.h
source/blender/blenlib/intern/path_util.c
source/blender/blenlib/intern/threads.c
source/blender/editors/curve/editcurve.c
source/blender/editors/mesh/CMakeLists.txt
source/blender/editors/mesh/SConscript
source/blender/editors/mesh/mesh_ops.c
source/blender/editors/object/CMakeLists.txt
source/blender/editors/object/SConscript
source/blender/editors/object/object_bake.c
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_ops.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_buttons.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/editors/transform/transform_generics.c
source/blender/editors/transform/transform_snap.c
source/blender/gpu/intern/gpu_buffers.c
source/blender/modifiers/intern/MOD_explode.c
source/blender/python/intern/bpy_app_handlers.c
source/blenderplayer/CMakeLists.txt
source/creator/CMakeLists.txt