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)
1  2 
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