Merged changes in the trunk up to revision 31403.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Tue, 17 Aug 2010 07:10:03 +0000 (07:10 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Tue, 17 Aug 2010 07:10:03 +0000 (07:10 +0000)
commit92478de0eb1077666ee20976853a984d52ac6e45
tree2c023dffd5cada4f3c1de1d0e707e6d88e4414ed
parent30da80cc41dcd401428e99de85b14c0b4393090b
parent40bf37e3b661cf7675cbd578391c379332522c40
Merged changes in the trunk up to revision 31403.
15 files changed:
release/scripts/ui/space_userpref.py
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_outliner/outliner.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/python/CMakeLists.txt
source/blender/python/SConscript
source/blender/python/doc/sphinx_doc_gen.py
source/blender/python/intern/bpy.c
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/source/pipeline.c
source/creator/creator.c