Merged changes in the trunk up to revision 30814.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 28 Jul 2010 01:06:47 +0000 (01:06 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 28 Jul 2010 01:06:47 +0000 (01:06 +0000)
commit44f511496481689e0afe0caf780d645df97acab4
tree7f605cbf8f05d3e641dbdb87f484ce10bcf24e02
parenta99a466feec7c2e88af967769205f43fa74f1161
parent51e8926cb9935da2e9cecd47acd414de241eb786
Merged changes in the trunk up to revision 30814.

This commit includes r30807, which is equivalent to r30602 in the branch
for fixiing a layout issue.
release/scripts/ui/properties_render.py
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c