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)
1  2 
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_object.c