[Orxonox-commit 1346] r6064 - code/trunk/src/orxonox

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-11-15 00:28:34 +0100 (Sun, 15 Nov 2009)
New Revision: 6064

Modified:
   code/trunk/src/orxonox/Scene.cc
Log:
Code looks better symmetrically. Actually it's probably a potential bug..

Modified: code/trunk/src/orxonox/Scene.cc
===================================================================
--- code/trunk/src/orxonox/Scene.cc	2009-11-14 22:18:49 UTC (rev 6063)
+++ code/trunk/src/orxonox/Scene.cc	2009-11-14 23:28:34 UTC (rev 6064)
@@ -341,12 +341,8 @@
         // false means that bullet will assume we didn't modify the contact
         bool modified = false;
         if (object0->isCollisionCallbackActive())
-        {
             modified |= object0->collidesAgainst(object1, cp);
-            if (object1->isCollisionCallbackActive())
-                modified |= object1->collidesAgainst(object0, cp);
-        }
-        else
+        if (object1->isCollisionCallbackActive())
             modified |= object1->collidesAgainst(object0, cp);
 
         return modified;