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)
commitdfe8c55e2d67060a5828fd5cc8660fce5aa2e326
treeff875b8162bebe3ca1077f6207c81824c9825cb5
parent40e58dbca98898c8dd7db16eb6cfce17137a02fa
parent749d284b498fb1cde7996d712497ce478c978f3a
Merging r45877 through r45927 from trunk into soc-2011-tomato
source/blender/blenloader/intern/readfile.c
source/blender/makesdna/DNA_scene_types.h