Merged changes in the trunk up to revision 25863.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 10 Jan 2010 15:28:24 +0000 (15:28 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 10 Jan 2010 15:28:24 +0000 (15:28 +0000)
commit7b530567ef005e67529f0778a098ab27a560534f
tree3c8a3e496552af90a915f486a0b81913e0086ce1
parent622a65a297b82f6f63baff124f42e02a8f6ef29c
parent2c56c59dfe30b4a44fe06135aba60b60bc6aa457
Merged changes in the trunk up to revision 25863.
13 files changed:
release/scripts/ui/properties_render.py
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/CMakeLists.txt
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/transform/transform.c
source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.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/intern/source/pipeline.c