Merged 38568-38822
authorJason Hays <jason_hays22@mymail.eku.edu>
Fri, 29 Jul 2011 17:57:46 +0000 (17:57 +0000)
committerJason Hays <jason_hays22@mymail.eku.edu>
Fri, 29 Jul 2011 17:57:46 +0000 (17:57 +0000)
commit5b6da0c1d137e9977fb8fdc25df8bd295650138a
tree1d108d733afa6feb78ec130578fa203a54d5fedc
parent566d9361798ade5d9749cf59231b8c88c21bbe20
parentfb738f4929e88b21ebcfb724ae3f460ef6e0f949
Merged 38568-38822
release/scripts/startup/bl_ui/space_view3d.py
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/editors/armature/editarmature.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c