svn merge ^/trunk/blender -r40432:40491
authorCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 13:04:01 +0000 (13:04 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 13:04:01 +0000 (13:04 +0000)
commit9494340dae7dd5e3ee070d8e550596a440648870
treee73e1b3ede7373db7b8e26db687941b4669b9244
parent74e21161e327a0f91ecef0f8dd1bce65c9e2ef4b
parenta7891da84bfad1f0cd0f3fc825e7f4dedf469a00
svn merge ^/trunk/blender -r40432:40491
26 files changed:
release/scripts/startup/bl_ui/space_info.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/key.c
source/blender/blenkernel/intern/multires.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/operators/extrudeops.c
source/blender/editors/armature/editarmature.c
source/blender/editors/curve/editcurve.c
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_ops.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/modifiers/intern/MOD_solidify.c
source/blender/modifiers/intern/MOD_warp.c
source/blender/modifiers/intern/MOD_weightvgedit.c
source/blender/modifiers/intern/MOD_weightvgmix.c
source/blender/modifiers/intern/MOD_weightvgproximity.c