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)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/render/intern/source/pipeline.c
source/creator/creator.c

Simple merge