Merged 39338-39558
authorJason Hays <jason_hays22@mymail.eku.edu>
Fri, 19 Aug 2011 17:15:30 +0000 (17:15 +0000)
committerJason Hays <jason_hays22@mymail.eku.edu>
Fri, 19 Aug 2011 17:15:30 +0000 (17:15 +0000)
commitc58fb76f1a043124debf2a71e6c56f2a478a0dde
tree393c06981022e6159df7c6b9efc3b5062ab7f6af
parentc57d64468bc9009a11cafdbf0cc66e83cdaa6841
parent3a81f23e0975ea87ade780965462ad5b15b39d95
Merged 39338-39558
release/scripts/startup/bl_ui/properties_data_mesh.py
source/blender/blenkernel/BKE_DerivedMesh.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/editors/mesh/editmesh.c
source/blender/editors/mesh/editmesh_mods.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/makesrna/intern/rna_object.c