svn merge -r 12684:12691 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Tue, 27 Nov 2007 13:25:07 +0000 (13:25 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Tue, 27 Nov 2007 13:25:07 +0000 (13:25 +0000)
commit087a549e5514c3c820e83bbc11ddde63eef3f475
tree551cffd4bb2051ce37339e26ad156bda3790f014
parent41745b8a506866f301c2e68cc36628f2b68a1581
parent2fa5e8fdc995e372908da7b57321cedca0a4d6b1
svn merge -r 12684:12691 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/blenkernel/BKE_cloth.h
source/blender/blenkernel/intern/cloth.c
source/blender/blenkernel/intern/implicit.c
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/softbody.c
source/blender/src/buttons_editing.c
source/blender/src/buttons_object.c