Merged changes in the trunk up to revision 30952.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 1 Aug 2010 23:37:52 +0000 (23:37 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 1 Aug 2010 23:37:52 +0000 (23:37 +0000)
commita5692fd67bedf71f849d330c83239a47ad93e3e7
tree8e0ee63a3c9075dee1d50c14795658896c69adf4
parent4cfdedbe6167d8c3a596bde24dde23ce578b1764
parentc92e3225f3aa5fadb9ad0920dffbdc0c0209a98a
Merged changes in the trunk up to revision 30952.
18 files changed:
release/scripts/ui/space_userpref.py
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/render/render_shading.c
source/blender/editors/space_outliner/outliner.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/intern/rna_scene.c
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/include/render_types.h
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/shadeinput.c
source/blender/render/intern/source/shadeoutput.c
source/creator/creator.c