svn merge ^/trunk/blender -r43616:43639
authorCampbell Barton <ideasman42@gmail.com>
Mon, 23 Jan 2012 16:46:35 +0000 (16:46 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 23 Jan 2012 16:46:35 +0000 (16:46 +0000)
commit5cc898ada2fbe11e1847c385b0c0439df3a706df
tree5b61839f273a2f4204f4cf92b291ef9e01ce7e06
parent6c9438ea8a34054c66690a8c5d49162d0fd9379a
parent74b4fd26d2d1dde537a46f9237839c057cd03aaf
svn merge ^/trunk/blender -r43616:43639
source/blender/blenkernel/intern/cloth.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_modifier.c