Changeset 11071 for code/trunk/src/orxonox/CameraManager.cc
- Timestamp:
- Jan 17, 2016, 10:29:21 PM (8 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/CameraManager.cc
r10624 r11071 60 60 return this->cameraList_.front(); 61 61 else 62 return 0;62 return nullptr; 63 63 } 64 64 … … 93 93 this->cameraList_.front()->setFocus(); 94 94 else 95 this->useCamera( NULL);95 this->useCamera(nullptr); 96 96 } 97 97 else
Note: See TracChangeset
for help on using the changeset viewer.