Merged from trunk 38474-38568
authorJason Hays <jason_hays22@mymail.eku.edu>
Thu, 21 Jul 2011 16:51:36 +0000 (16:51 +0000)
committerJason Hays <jason_hays22@mymail.eku.edu>
Thu, 21 Jul 2011 16:51:36 +0000 (16:51 +0000)
commit05c6d22af1e660c5659aa9e50b848240138e37a1
tree032697055f2bb0719287ea25848ccef8529e6bff
parentfc2376c1dd8481058a3109b65d7a76422e11e30f
parent3e9d1d7683c7d7bf2386c73048808bacd238d550
Merged from trunk 38474-38568
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_object.c