Merging r46074 through r46095 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 30 Apr 2012 06:55:03 +0000 (06:55 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 30 Apr 2012 06:55:03 +0000 (06:55 +0000)
1  2 
source/blender/blenkernel/intern/movieclip.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_userdef.c