Merged changes in the trunk up to revision 27992.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 4 Apr 2010 19:50:22 +0000 (19:50 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 4 Apr 2010 19:50:22 +0000 (19:50 +0000)
commitf9e2f6acd761492c52500bf72e32a4ad5a33757b
treedf44ac89101bf0be263a8d53623c9302dca5e59c
parent65b2ef5b15ae56758f7097df98dbce9ba3fe1454
parent687c752b75bc488b2de5a4186ba2398b31dbb46e
Merged changes in the trunk up to revision 27992.
15 files changed:
release/scripts/ui/properties_render.py
release/scripts/ui/space_userpref.py
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/scene.c
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/space_view3d/view3d_edit.c
source/blender/editors/transform/transform.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_scene.c
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/source/pipeline.c