Merged changes in the trunk up to revision 25613.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Tue, 29 Dec 2009 21:46:36 +0000 (21:46 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Tue, 29 Dec 2009 21:46:36 +0000 (21:46 +0000)
commit05603fa110e4e40a12db8d97789f8a56e62aa3f7
tree6c4a5b46f239836ac142c7d230bb28d5307bb86d
parent3bc3e454f01213ee68b0933a114cd9e055da7ee7
parent7831edbc5995a25636b466bc2c02e591aad7d45e
Merged changes in the trunk up to revision 25613.
release/scripts/ui/properties_render.py
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