Merged changes in the trunk up to revision 28772.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Fri, 14 May 2010 21:50:15 +0000 (21:50 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Fri, 14 May 2010 21:50:15 +0000 (21:50 +0000)
1  2 
release/scripts/ui/space_userpref.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/render/render_shading.c
source/blender/makesrna/RNA_access.h
source/blender/python/doc/sphinx_doc_gen.py
source/blender/python/intern/bpy.c
source/creator/creator.c

Simple merge
Simple merge
Simple merge
Simple merge