Merged changes in the trunk up to revision 29409.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Fri, 11 Jun 2010 17:17:02 +0000 (17:17 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Fri, 11 Jun 2010 17:17:02 +0000 (17:17 +0000)
commitdf0b629e246cc7fa091b00b97a2158877bd10ce3
tree243613c408318df3964fc5ebcd5a7fc33b4ca56d
parentad2f4905301854f07d59bc290488da7ce4e7df57
parent66134ea38166742444720a4fe2f8d95effd8866a
Merged changes in the trunk up to revision 29409.
14 files changed:
release/scripts/ui/properties_render.py
release/scripts/ui/space_userpref.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/render/CMakeLists.txt
source/blender/editors/render/render_shading.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/doc/sphinx_doc_gen.py
source/blender/python/intern/bpy.c
source/creator/CMakeLists.txt
source/creator/creator.c