Merging r45810 through r45876 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 23 Apr 2012 10:19:59 +0000 (10:19 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 23 Apr 2012 10:19:59 +0000 (10:19 +0000)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/editors/transform/transform_conversions.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_tracking.c
source/blender/makesrna/intern/rna_userdef.c