From 5832f2fb7bd396e45690b1765103d4136694845a Mon Sep 17 00:00:00 2001 From: Janne Karhu Date: Mon, 21 Dec 2009 11:19:07 +0000 Subject: =?UTF-8?q?*=20Rest=20length=20parameter=20for=20harmonic=20force?= =?UTF-8?q?=20springs.=20Implementation=20is=20a=20slightly=20modified=20v?= =?UTF-8?q?ersion=20of=20the=20patch=20provided=20by=20Ra=C3=BAl=20Fern?= =?UTF-8?q?=C3=A1ndez=20Hern=C3=A1ndez=20(Farsthary).=20*=20Also=20added?= =?UTF-8?q?=20a=20"multiple=20springs"=20option=20to=20use=20every=20effec?= =?UTF-8?q?tor=20point=20as=20a=20harmonic=20spring=20instead=20of=20just?= =?UTF-8?q?=20one.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/blender/makesdna/DNA_object_force.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/makesdna/DNA_object_force.h') diff --git a/source/blender/makesdna/DNA_object_force.h b/source/blender/makesdna/DNA_object_force.h index adccf8893d4..99b8f400a5e 100644 --- a/source/blender/makesdna/DNA_object_force.h +++ b/source/blender/makesdna/DNA_object_force.h @@ -71,7 +71,7 @@ typedef struct PartDeflect { float f_flow; /* How much force is converted into "air flow", i.e. */ /* force used as the velocity of surrounding medium. */ - float f_size; + float f_size; /* Noise size for noise effector, restlength for harmonic effector */ /* fall-off */ float f_power; /* The power law - real gravitation is 2 (square) */ @@ -320,6 +320,7 @@ typedef struct SoftBody { #define PFIELD_TEX_OBJECT 64 #define PFIELD_GLOBAL_CO 64 /* used for turbulence */ #define PFIELD_TEX_2D 128 +#define PFIELD_MULTIPLE_SPRINGS 128 /* used for harmonic force */ #define PFIELD_USEMIN 256 #define PFIELD_USEMAXR 512 #define PFIELD_USEMINR 1024 -- cgit v1.2.3