Merged changes in the trunk up to revision 30167.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 10 Jul 2010 00:37:42 +0000 (00:37 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 10 Jul 2010 00:37:42 +0000 (00:37 +0000)
1  2 
release/scripts/ui/space_userpref.py
source/blender/blenkernel/intern/scene.c
source/blender/editors/interface/interface_templates.c
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/source/pipeline.c

Simple merge