Changeset 10415 for code/branches/core7/src/orxonox/collisionshapes
- Timestamp:
- May 3, 2015, 12:19:49 PM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/core7/src/orxonox/collisionshapes/CollisionShape.cc
r10362 r10415 41 41 #include "CompoundCollisionShape.h" 42 42 #include "WorldEntityCollisionShape.h" 43 #include "Scene.h" 43 44 44 45 namespace orxonox … … 74 75 { 75 76 // Detach from parent CompoundCollisionShape. 76 if (this->isInitialized() && this->parent_) 77 this->parent_->detach(this); 77 if (this->isInitialized()) 78 { 79 if (this->getScene() && this->getScene()->isUpdatingPhysics()) 80 orxout(internal_error) << "Don't destroy collision shapes while the physics is updated! This will lead to crashes" << endl; 81 82 if (this->parent_) 83 this->parent_->detach(this); 84 } 78 85 } 79 86
Note: See TracChangeset
for help on using the changeset viewer.