Merged changes in the trunk up to revision 26719.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 8 Feb 2010 21:13:33 +0000 (21:13 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 8 Feb 2010 21:13:33 +0000 (21:13 +0000)
commited266e868cee7e922f028227ee22492d7e830253
tree7eacd3765dbf381d8617f17e47c005165adc08ed
parent4ec75badf8a0ed6bb2b00b26947792ddc629a164
parent616af4fa52b4bdc3cbee3d6d1f17b5d1fb54a0b6
Merged changes in the trunk up to revision 26719.
12 files changed:
release/scripts/ui/properties_render.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/screen/screen_ops.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/bpy_interface.c
source/blender/render/intern/source/pipeline.c
source/creator/creator.c