Merge with trunk r38281
authorMiika Hamalainen <blender@miikah.org>
Sun, 10 Jul 2011 16:18:48 +0000 (16:18 +0000)
committerMiika Hamalainen <blender@miikah.org>
Sun, 10 Jul 2011 16:18:48 +0000 (16:18 +0000)
commit4b80e1aba2e6f92b08ceddca2cab7d108ef8fac0
tree25314bc064fbd9fc4607400fcd8f793be87a8343
parent77faef7b5f9d0d1cc80bff88e261ff8028f621cf
parentb62a956cc8c9402880d249d0a70c880af5813bc3
Merge with trunk r38281
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/makesdna/DNA_object_force.h
source/blender/makesrna/intern/rna_object_force.c