Changeset 2445 for code/branches/physics_merge/src/orxonox/objects/collisionshapes/CollisionShape.cc

Timestamp:

Dec 14, 2008, 7:06:12 PM (17 years ago)

Author:

rgrieder

Message:

Small adjustments due to the merge.

File:

• code/branches/physics_merge/src/orxonox/objects/collisionshapes/CollisionShape.cc (modified) (1 diff)

code/branches/physics_merge/src/orxonox/objects/collisionshapes/CollisionShape.cc

@@ -50 +50 @@
 
         this->parent_ = 0;
-        this->parentID_ = (unsigned int)-1;
+        this->parentID_ = OBJECTID_UNKNOWN;
         this->collisionShape_ = 0;
         this->position_ = Vector3::ZERO;