svn merge ^/trunk/blender -r42466:42495
authorCampbell Barton <ideasman42@gmail.com>
Wed, 7 Dec 2011 18:29:21 +0000 (18:29 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 7 Dec 2011 18:29:21 +0000 (18:29 +0000)
commitb245dfbc06feec5b73df23e55df21ef404feacd3
tree1a04addb2909c27827f42339d91a9bba22fb2677
parent2a35e8f9c140d082c6292efcf5b05f52aee6c95e
parent3637794436b6a37ae9447adbd9baaccc0add0823
svn merge ^/trunk/blender -r42466:42495
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/space_view3d/view3d_snap.c
source/blender/windowmanager/intern/wm_gesture.c