Merged changes in the trunk up to revision 26976.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Tue, 16 Feb 2010 22:34:43 +0000 (22:34 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Tue, 16 Feb 2010 22:34:43 +0000 (22:34 +0000)
commit709678ca8787e29a12348b50ae7c694f87be0d86
treea732145ccf09657e2186456563142e9dec06a891
parent39ea873a8bc91a7fc4df7b1fa7a7a18239fddae1
parentdf4d7b041e8339003da2d3c1ebd0eeaf66d4eb59
Merged changes in the trunk up to revision 26976.
14 files changed:
release/scripts/ui/properties_render.py
release/scripts/ui/space_userpref.py
source/blender/blenkernel/intern/material.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/render/render_shading.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/transform/transform.c
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/bpy.c
source/blender/render/intern/source/shadeoutput.c
source/creator/creator.c