Merged changes in the trunk up to revision 29030.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Thu, 27 May 2010 21:51:16 +0000 (21:51 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Thu, 27 May 2010 21:51:16 +0000 (21:51 +0000)
1  2 
release/scripts/ui/space_userpref.py
source/blender/blenloader/intern/readfile.c
source/blender/makesrna/RNA_access.h
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/include/render_types.h
source/blender/render/intern/source/pipeline.c
source/creator/creator.c

Simple merge
Simple merge
Simple merge