Merged changes in the trunk up to revision 31987.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 18 Sep 2010 00:50:13 +0000 (00:50 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 18 Sep 2010 00:50:13 +0000 (00:50 +0000)
commit28d618e41b33fe1f351af4fa7100c84ed68a4b13
tree6b15f23f128c65cb46101864c667dd81cd073b2b
parent56303415e4d534d4f2f4075a818a2aa19ea19fbd
parent3e1ff2e590970c6db02859df0f73531692767cbf
Merged changes in the trunk up to revision 31987.
release/scripts/ui/properties_render.py
release/scripts/ui/space_userpref.py
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/makesrna/intern/rna_internal.h
source/creator/CMakeLists.txt
source/creator/creator.c