svn merge -r 13148:13177 https://svn.blender.org/svnroot/bf-blender/trunk/blender...
authorDaniel Genrich <daniel.genrich@gmx.net>
Wed, 9 Jan 2008 12:04:54 +0000 (12:04 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Wed, 9 Jan 2008 12:04:54 +0000 (12:04 +0000)
commit43cd8a9f71da3e0d1a78a5c1e089afd464862a42
tree3615d80057d47d114e0ff19e38d51cdb4710be09
parent86d8ef3f9125b4439b5231a756cee5cb89e3f270
parent048170bc6f8e20beec8aedb4753991b027c65f4f
svn merge -r 13148:13177 https://svn.blender.org/svnroot/bf-blender/trunk/blender + fixed one crash on enabling deflection
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/softbody.c
source/blender/blenloader/intern/readfile.c
source/blender/makesdna/DNA_object_force.h
source/blender/src/buttons_object.c
source/blender/src/drawobject.c
source/blender/src/editparticle.c
source/blender/src/toolbox.c