- Timestamp:
- Nov 4, 2015, 10:25:42 PM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v2/src/orxonox/worldentities/WorldEntity.cc
r10624 r10765 563 563 void WorldEntity::detachOgreObject(Ogre::MovableObject* object) 564 564 { 565 object->setUserAny(Ogre::Any(static_cast<OrxonoxClass*>( NULL)));565 object->setUserAny(Ogre::Any(static_cast<OrxonoxClass*>(nullptr))); 566 566 this->node_->detachObject(object); 567 567 } … … 660 660 { 661 661 // If physics is enabled scale the attached CollisionShape. 662 /*if (this->hasPhysics() && this->collisionShape_ != NULL)662 /*if (this->hasPhysics() && this->collisionShape_ != nullptr) 663 663 { 664 664 this->collisionShape_->setScale3D(scale);
Note: See TracChangeset
for help on using the changeset viewer.