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)
commit11e8782d01444c102ef111df39929207d3a4b145
treefc364f3a2e46741485754d1c2e3bac6da22b10ef
parentd15f2b562e3ead5c91c89da5c384e9359418e27a
parent1ba9766ab5cd8768c0fac2aab9a73fc3a21bf605
Merged changes in the trunk up to revision 29030.
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