svn merge -r40000:40179 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Tue, 13 Sep 2011 10:05:30 +0000 (10:05 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 13 Sep 2011 10:05:30 +0000 (10:05 +0000)
commit7d02e66256ea2866b121bd958f83d55866381412
treedf5c675d1351aab20bd4f10e51effaae7a19b39e
parent92089e3c4d89c2689dbd4452fb21cbbd9a0ecc71
parentee32d36a599ccda9c3d5543cb631bb07da06958b
svn merge -r40000:40179 https://svn.blender.org/svnroot/bf-blender/trunk/blender
13 files changed:
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/editors/armature/meshlaplacian.c
source/blender/editors/mesh/editmesh.c
source/blender/editors/mesh/editmesh_mods.c
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_ops.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_object_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_scene.c