← Back to branch summary

~ubuntu-branches/debian/jessie/yade/jessie

« back to all changes in this revision

Viewing changes to pkg/common/InteractionLoop.cpp

  • Committer: Package Import Robot
  • Author(s): Anton Gladky
  • Date: 2014-08-04 19:34:58 UTC
  • mfrom: (1.1.11)
  • Revision ID: package-import@ubuntu.com-20140804193458-cw8qhnujxe9wzi15
Tags: 1.11.0-1
* [a0600ae] Imported Upstream version 1.11.0
* [a3055e0] Do not use parallel build on kfreebsd-amd64 and s390x.
* [f86b405] Remove applied patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
pkg/common/InteractionLoop.cpp
137
137
                        assert(!swap); // reverse call would make no sense, as the arguments are of different types
138
138
                }
139
139
                assert(I->functorCache.constLaw);
140
 
                I->functorCache.constLaw->go(I->geom,I->phys,I.get());
 
140
                //If the functor return false, the interaction is reset
 
141
                if (!I->functorCache.constLaw->go(I->geom,I->phys,I.get())) scene->interactions->requestErase(I);
141
142
 
142
143
                // process callbacks for this interaction
143
144
                if(!I->isReal()) continue; // it is possible that Law2_ functor called requestErase, hence this check