Changeset 8145 in orxonox.OLD for trunk/src/lib/collision_reaction

Timestamp:

Jun 5, 2006, 11:49:26 AM (18 years ago)

Author:

bensch

Message:

trunk: merged the gui back
merged with command:
svn merge -r8114:HEAD ​https://svn.orxonox.net/orxonox/branches/gui .
→ no conflicts

File:

• trunk/src/lib/collision_reaction/cr_engine.h (modified) (1 diff)

trunk/src/lib/collision_reaction/cr_engine.h

@@ -51 +51 @@
 
   /** @returns an instance to a collision object. instead of creating new object this ones can be resycled */
-inline Collision* getCollisionObject() { /* return the first element of the cache list*/ }
+  inline Collision* getCollisionObject() { /* return the first element of the cache list*/ }
   /** @param collision: returns the Collision object back to the cache list */
   inline void putCollisionObject(Collision* collision) { this->cachedCollisions.push_back(collision); }