svn merge -r39558:39800 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Tue, 13 Sep 2011 06:39:17 +0000 (06:39 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 13 Sep 2011 06:39:17 +0000 (06:39 +0000)
commitb310a76a1b8964fd776620f8444c1c1a7a308a8e
treedcf2b80af79403c2b5fb81c85e337f4adc3eba2f
parentc58fb76f1a043124debf2a71e6c56f2a478a0dde
parent047e8224b14aa7836db3b067824258e49e8602db
svn merge -r39558:39800 https://svn.blender.org/svnroot/bf-blender/trunk/blender
19 files changed:
release/scripts/startup/bl_ui/properties_data_mesh.py
release/scripts/startup/bl_ui/space_view3d.py
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/blenkernel/BKE_DerivedMesh.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/editors/armature/editarmature.c
source/blender/editors/include/ED_view3d.h
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_ops.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/makesdna/DNA_object_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_scene.c