svn merge ^/trunk/blender -r40389:r40390
authorCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 07:17:07 +0000 (07:17 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 07:17:07 +0000 (07:17 +0000)
commitea4b3fee1f51db4e6cd53daf8071429991dc95e3
tree7ad3333d1086acc8ea27487ebe105b8d7397f31b
parent049c18405af788af57a1ebe2f396cc0cc8a16b6e
parent84d06f252e1637e76abd59478183c7afd4a80a9e
svn merge ^/trunk/blender -r40389:r40390
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/editors/mesh/mesh_data.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/drawvolume.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_manipulator.c
source/blender/windowmanager/intern/wm_gesture.c