Changeset 10417 for code/branches/core7/src/orxonox/collisionshapes/CompoundCollisionShape.cc

Timestamp:

May 3, 2015, 1:31:18 PM (9 years ago)

Author:

landauf

Message:

moved destruction of bullet collision shape to ~CollisionShape(). CompoundCollisionShape needs some trickery to avoid that a shape gets deleted twice because it does some magic (i.e. assignments) in CompoundCollisionShape::updatePublicShape()

File:

• code/branches/core7/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) (1 diff)

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

@@ -71 +71 @@
                 it->first->notifyDetached();
                 it->first->destroy();
+                if (this->collisionShape_ == it->second)
+                    this->collisionShape_ = NULL; // don't destroy it twice
             }
 
             delete this->compoundShape_;
+            if (this->collisionShape_ == this->compoundShape_)
+                this->collisionShape_ = NULL; // don't destroy it twice
         }
     }