Changeset 10765 for code/branches/cpp11_v2/src/orxonox/graphics

Timestamp:

Nov 4, 2015, 10:25:42 PM (10 years ago)

Author:

landauf

Message:

replace 'NULL' by 'nullptr'

Location:

code/branches/cpp11_v2/src/orxonox/graphics

Files:

• Billboard.cc (modified) (4 diffs)
• Model.cc (modified) (1 diff)

code/branches/cpp11_v2/src/orxonox/graphics/Billboard.cc

@@ -139 +139 @@
     {
         Ogre::BillboardSet* bSet = this->billboard_.getBillboardSet();
-        if( bSet != NULL )
+        if( bSet != nullptr )
         {
             bSet->setBillboardType(bbt);
@@ -148 +148 @@
     {
         Ogre::BillboardSet* bSet = this->billboard_.getBillboardSet();
-        if( bSet != NULL )
+        if( bSet != nullptr )
         {
             bSet->setCommonDirection( vec );
@@ -157 +157 @@
     {
         Ogre::BillboardSet* bSet = this->billboard_.getBillboardSet();
-        if( bSet != NULL )
+        if( bSet != nullptr )
         {
             bSet->setCommonUpVector( vec );
@@ -166 +166 @@
     {
         Ogre::BillboardSet* bSet = this->billboard_.getBillboardSet();
-        if( bSet != NULL )
+        if( bSet != nullptr )
         {
             bSet->setDefaultDimensions(width, height);

code/branches/cpp11_v2/src/orxonox/graphics/Model.cc

@@ -157 +157 @@
                 BaseObject* creatorPtr = this;
 
-                while(creatorPtr!=NULL&&orxonox_cast<WorldEntity*>(creatorPtr))
+                while(creatorPtr!=nullptr&&orxonox_cast<WorldEntity*>(creatorPtr))
                 {
                     scaleFactor *= getBiggestScale(((WorldEntity*) creatorPtr)->getScale3D());