diff options
| author | Jens Ole Wund <bjornmose@gmx.net> | 2010-02-13 03:52:01 +0300 |
|---|---|---|
| committer | Jens Ole Wund <bjornmose@gmx.net> | 2010-02-13 03:52:01 +0300 |
| commit | ac7f0ac60661326e7ad7b2db2cea0822654fdbb6 (patch) | |
| tree | 592d88152c021c2576d580157eae4c129f36f24f /source/blender/blenkernel | |
| parent | 33b1cbf06d2c822c68676390b1775eb5d78de6e6 (diff) | |
fixing cuckoo bugs
- no i really don't like abusing group indexes (would like to have written indices .. but spell checker complains SIGH )
anyhow
lattices and curves do not care for ambiguous vertex group index any more
just take weights as they are set
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/softbody.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 9be06dc2ced..f3d69cc458a 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -3486,7 +3486,9 @@ static void lattice_to_softbody(Scene *scene, Object *ob) sb= ob->soft; /* can be created in renew_softbody() */ /* weights from bpoints, same code used as for mesh vertices */ - if((ob->softflag & OB_SB_GOAL) && sb->vertgroup) { + /* if((ob->softflag & OB_SB_GOAL) && sb->vertgroup) { 2.4x one*/ + /* new! take the weights from lattice vertex anyhow */ + if(ob->softflag & OB_SB_GOAL){ BodyPoint *bp= sb->bpoint; BPoint *bpnt= lt->def; float goalfac= ABS(sb->maxgoal - sb->mingoal); @@ -3538,7 +3540,9 @@ static void curve_surf_to_softbody(Scene *scene, Object *ob) bs= sb->bspring; /* weights from bpoints, same code used as for mesh vertices */ - if((ob->softflag & OB_SB_GOAL) && sb->vertgroup) + /* if((ob->softflag & OB_SB_GOAL) && sb->vertgroup) 2.4x hack*/ + /* new! take the weights from curve vertex anyhow */ + if(ob->softflag & OB_SB_GOAL) setgoal= 1; for(nu= cu->nurb.first; nu; nu= nu->next) { |