Merged changes in the trunk up to revision 25508.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 21 Dec 2009 22:38:06 +0000 (22:38 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 21 Dec 2009 22:38:06 +0000 (22:38 +0000)
commitd0fa71a68e520ad9de86c8e544abaaea76ae06b2
tree2c151ee2fd05a9123ce6574bb4470f9e09da384a
parent074f0de97088bb2588aebcf57d725f774e351210
parent8f3a529585186a8b0a3315d037ac374351c63221
Merged changes in the trunk up to revision 25508.
17 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/blenloader/intern/writefile.c
source/blender/editors/CMakeLists.txt
source/blender/editors/render/render_shading.c
source/blender/editors/screen/screen_ops.c
source/blender/freestyle/intern/application/AppConfig.cpp
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/SConscript
source/blender/render/intern/source/pipeline.c
source/creator/creator.c