Merged changes in the trunk up to revision 26856.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 13 Feb 2010 01:13:16 +0000 (01:13 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 13 Feb 2010 01:13:16 +0000 (01:13 +0000)
commit135a944c66c57f11fd77b4f7231686353112e7ac
tree3928c457f44f544113e84b3356ab101e3820072e
parent1b3948f9aad25fec1923f5ccd36ea525d8e34fb6
parent33b1cbf06d2c822c68676390b1775eb5d78de6e6
Merged changes in the trunk up to revision 26856.
28 files changed:
release/scripts/ui/properties_render.py
release/scripts/ui/space_userpref.py
source/blender/CMakeLists.txt
source/blender/blenkernel/CMakeLists.txt
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_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_outliner/outliner.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_orientations.c
source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/CMakeLists.txt
source/blender/python/intern/bpy.c
source/blender/render/CMakeLists.txt
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt
source/creator/creator.c