Merging r45877 through r45927 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 24 Apr 2012 15:26:26 +0000 (15:26 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 24 Apr 2012 15:26:26 +0000 (15:26 +0000)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/makesdna/DNA_scene_types.h