sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix T45247: Softbody ignores lattice weight

Browse Source 
Now multiply the lattice wight by the goal weight too.
This commit is contained in:
Campbell Barton 2015-07-14 06:18:58 +10:00
parent 240646f506
commit eee2d8e45c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenkernel/intern/softbody.c
View File

@ -3494,6 +3494,9 @@ static void lattice_to_softbody(Scene *scene, Object *ob)
if ((ob->softflag & OB_SB_GOAL) && (defgroup_index != -1)) {
bp->goal *= defvert_find_weight(&lt->dvert[a], defgroup_index);
}
else {
bp->goal *= bpnt->weight;
}
if (defgroup_index_mass != -1) {
bp->mass *= defvert_find_weight(&lt->dvert[a], defgroup_index_mass);
@ -3555,7 +3558,7 @@ static void curve_surf_to_softbody(Scene *scene, Object *ob)
/* not too hard to do, but needs some more code to care for; some one may want look at it JOW 2010/06/12*/
for (bezt=nu->bezt, a=0; a<nu->pntsu; a++, bezt++, bp+=3, curindex+=3) {
if (setgoal) {
bp->goal= bezt->weight;
bp->goal *= bezt->weight;
/* all three triples */
(bp+1)->goal= bp->goal;
@ -3590,7 +3593,7 @@ static void curve_surf_to_softbody(Scene *scene, Object *ob)
else {
for (bpnt=nu->bp, a=0; a<nu->pntsu*nu->pntsv; a++, bpnt++, bp++, curindex++) {
if (setgoal) {
bp->goal= bpnt->weight;
bp->goal *= bpnt->weight;
}
if (totspring && a>0) {
bs->v1= curindex-1;