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)
commitde07f51d9b7bb9b7a86dfdbf9b30fc97c84a03f6
tree61341490aced99cbedb2209818d1b385c14c18d1
parentf380a5430f036a02332794a7927c8b4d6d6c8955
parent7eaf3eb58e83203c3fccb80dfb3f579c2cfe5b75
Merging r45810 through r45876 from trunk into soc-2011-tomato
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