Changeset 6064 for code/trunk/src
- Timestamp:
- Nov 15, 2009, 12:28:34 AM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/orxonox/Scene.cc
r5929 r6064 342 342 bool modified = false; 343 343 if (object0->isCollisionCallbackActive()) 344 {345 344 modified |= object0->collidesAgainst(object1, cp); 346 if (object1->isCollisionCallbackActive()) 347 modified |= object1->collidesAgainst(object0, cp); 348 } 349 else 345 if (object1->isCollisionCallbackActive()) 350 346 modified |= object1->collidesAgainst(object0, cp); 351 347
Note: See TracChangeset
for help on using the changeset viewer.