svn merge ^/trunk/blender -r42564:42586
authorCampbell Barton <ideasman42@gmail.com>
Mon, 12 Dec 2011 21:01:39 +0000 (21:01 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 12 Dec 2011 21:01:39 +0000 (21:01 +0000)
commit8115753fd280c4e23f9d86508184ed057a9a2099
treea68a1b0d219f3521a41a23ed1f358a530b388978
parent80da50270dfd4c330302813aa3a92240a9361865
parent01478a3743f1d1fe3d641ff498953af027ca2e60
svn merge ^/trunk/blender -r42564:42586
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/object/object_hook.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/space_view3d/view3d_toolbar.c
source/blender/editors/util/undo.c