Merging r46096 through r46110 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 30 Apr 2012 12:09:25 +0000 (12:09 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 30 Apr 2012 12:09:25 +0000 (12:09 +0000)
commitc8b863288fdd26e049bd38fdec110da116e8579d
treecf8d4284cea05117260a6187ee71fa1ae67a216d
parent0974368b322ac06b41c90c1dfd87a2df91f324b9
parent796dd8a321108df26757fb9df5c2aa6eb42c9633
Merging r46096 through r46110 from trunk into soc-2011-tomato
source/blender/blenloader/intern/readfile.c
source/blender/makesrna/intern/rna_userdef.c
source/creator/CMakeLists.txt