Merged changes in the trunk up to revision 26409.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 30 Jan 2010 02:58:48 +0000 (02:58 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 30 Jan 2010 02:58:48 +0000 (02:58 +0000)
commit2d8ee7efa38758aa6de9383b6237d8948c7eecaf
tree1f43052627c875e225a53281463746756946ca14
parent972650d98304509c4d8aec96f9eb55dfb06b4049
parentada9ca9687cb70d02d1a6afebbb865d2080ddf1b
Merged changes in the trunk up to revision 26409.
17 files changed:
release/scripts/ui/properties_render.py
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/render/render_intern.h
source/blender/editors/render/render_ops.c
source/blender/editors/render/render_shading.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/intern/makesdna.c
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/CMakeLists.txt
source/creator/creator.c