forked from bartvdbraak/blender
- update effect.c for function def change of convertToDispListMesh
This commit is contained in:
parent
7176e8926f
commit
f333f124ca
@ -1456,7 +1456,7 @@ int SoftBodyDetectCollision(float opco[3], float npco[3], float colco[3],
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (dm) {
|
if (dm) {
|
||||||
disp_mesh = dm->convertToDispListMesh(dm);
|
disp_mesh = dm->convertToDispListMesh(dm, 1);
|
||||||
mface= disp_mesh->mface;
|
mface= disp_mesh->mface;
|
||||||
a = disp_mesh->totface;
|
a = disp_mesh->totface;
|
||||||
}
|
}
|
||||||
@ -1603,15 +1603,12 @@ int SoftBodyDetectCollision(float opco[3], float npco[3], float colco[3],
|
|||||||
|
|
||||||
}//while a
|
}//while a
|
||||||
/* give it away */
|
/* give it away */
|
||||||
if (dm) {
|
|
||||||
if (dmNeedsFree) dm->release(dm);
|
|
||||||
}
|
|
||||||
if (disp_mesh) {
|
if (disp_mesh) {
|
||||||
displistmesh_free(disp_mesh);
|
displistmesh_free(disp_mesh);
|
||||||
}
|
}
|
||||||
|
if (dm) {
|
||||||
|
if (dmNeedsFree) dm->release(dm);
|
||||||
|
}
|
||||||
} // if(ob->pd && ob->pd->deflect)
|
} // if(ob->pd && ob->pd->deflect)
|
||||||
}//if (base->object->type==OB_MESH && (base->lay & par_layer)) {
|
}//if (base->object->type==OB_MESH && (base->lay & par_layer)) {
|
||||||
base = base->next;
|
base = base->next;
|
||||||
|
Loading…
Reference in New Issue
Block a user