svn merge ^/trunk/blender -r43220:43278 --accept postpone
authorCampbell Barton <ideasman42@gmail.com>
Wed, 11 Jan 2012 14:14:04 +0000 (14:14 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 11 Jan 2012 14:14:04 +0000 (14:14 +0000)
commitb308e613126f8c89e954705aa512a3ef6a1f551d
tree4a875450b2ba9766fbdf4914e8cb003e8132497c
parent98bdf0274b1052efe25b6216f488d2a40fa43d1c
parentcda5d1769d71832a6b04ed6c91bac101c482e5f7
svn merge ^/trunk/blender -r43220:43278 --accept postpone
16 files changed:
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/cloth.c
source/blender/blenkernel/intern/multires.c
source/blender/editors/include/ED_view3d.h
source/blender/editors/object/object_edit.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/space_view3d/view3d_select.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/SConscript
source/blender/windowmanager/intern/wm_init_exit.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt