yade-dev team mailing list archive
-
yade-dev team
-
Mailing list archive
-
Message #05363
[Branch ~yade-dev/yade/trunk] Rev 2367: - Missing in last commit sorry.
------------------------------------------------------------
revno: 2367
committer: bchareyre <bchareyre@dt-rv020>
branch nick: trunk
timestamp: Wed 2010-07-14 21:18:03 +0200
message:
- Missing in last commit sorry.
modified:
py/_utils.cpp
--
lp:yade
https://code.launchpad.net/~yade-dev/yade/trunk
Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription
=== modified file 'py/_utils.cpp'
--- py/_utils.cpp 2010-06-08 22:25:00 +0000
+++ py/_utils.cpp 2010-07-14 19:18:03 +0000
@@ -127,7 +127,7 @@
const shared_ptr<Body>& b1=Body::byId(i->getId1(),rb), b2=Body::byId(i->getId2(),rb);
if(!b1->maskOk(mask) || !b2->maskOk(mask)) continue;
if(useBB && !isInBB(b1->state->pos,bbMin,bbMax) && !isInBB(b2->state->pos,bbMin,bbMax)) continue;
- GenericSpheresContact* geom=dynamic_cast<GenericSpheresContact*>(i->interactionGeometry.get());
+ ScGeom* geom=dynamic_cast<ScGeom*>(i->interactionGeometry.get());
if(!geom) continue;
Vector3r n(geom->normal); n[axis]=0.; Real nLen=n.norm();
if(nLen<minProjLen) continue; // this interaction is (almost) exactly parallel to our axis; skip that one