Merged changes in the trunk up to revision 31440.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 18 Aug 2010 13:16:34 +0000 (13:16 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 18 Aug 2010 13:16:34 +0000 (13:16 +0000)
commit4fae9113834651bc71ee018eaebf526e87ac304b
tree3962fc87797389c214782f545077f9b22ba9e5d0
parentf5247d94250b134820c41ac3c27e1959d068dd73
parentc04199b3a1b5ac2894bef46395852bd2bc462f62
Merged changes in the trunk up to revision 31440.
release/scripts/ui/properties_render.py
release/scripts/ui/space_userpref.py
source/blender/blenkernel/intern/idcode.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/transform/transform.c
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/doc/sphinx_doc_gen.py