Merged changes in the trunk up to revision 28984.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 26 May 2010 00:55:35 +0000 (00:55 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 26 May 2010 00:55:35 +0000 (00:55 +0000)
commit0ff5ea0df87f3fc871044208407e9c3852eab055
treee463d6f4bf8eadab770dee7eb4fa147c2bd8cfb1
parent96e79172a010cba6bc826f570832ef4b355ea0cd
parent244cda6f1ae3a0311c118953197704f1391eb702
Merged changes in the trunk up to revision 28984.
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/render/intern/source/pipeline.c
source/creator/creator.c