Changeset 5935 for code/branches/pickup/src/orxonox/collisionshapes/CompoundCollisionShape.cc

Timestamp:

Oct 13, 2009, 5:05:17 PM (16 years ago)

Author:

dafrick

Message:

Hopefully merged trunk successfully into pickup branch.

Location:

code/branches/pickup

Files:

• . (modified) (1 prop)
• src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) (1 diff)

code/branches/pickup/src/orxonox/collisionshapes/CompoundCollisionShape.cc

@@ -56 +56 @@
                 // make sure that the child doesn't want to detach itself --> speedup because of the missing update
                 it->first->notifyDetached();
-                delete it->first;
+                it->first->destroy();
             }