- Timestamp:
- Feb 21, 2018, 12:03:52 AM (6 years ago)
- Location:
- code/branches/cegui0.8_ogre1.9
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cegui0.8_ogre1.9
- Property svn:mergeinfo changed
/code/branches/cegui0.8 (added) merged: 11110,11118,11121,11124 /code/branches/ogre1.9 (added) merged: 11125-11132,11211,11453-11454
- Property svn:mergeinfo changed
-
code/branches/cegui0.8_ogre1.9/src/libraries/core/GraphicsManager.cc
r11115 r11795 45 45 #include <OgreViewport.h> 46 46 #include <OgreWindowEventUtilities.h> 47 #if OGRE_VERSION >= 0x010900 48 # include <Overlay/OgreOverlaySystem.h> 49 #endif 47 50 48 51 #include "SpecialConfig.h" … … 115 118 this->loadOgreRoot(); 116 119 120 #if OGRE_VERSION >= 0x010900 121 this->overlaySystem_ = new Ogre::OverlaySystem(); 122 #else 123 this->overlaySystem_ = nullptr; 124 #endif 125 117 126 // At first, add the root paths of the data directories as resource locations 118 127 Ogre::ResourceGroupManager::getSingleton().addResourceLocation(ConfigurablePaths::getDataPathString(), "FileSystem"); … … 155 164 Loader::getInstance().unload(extResources_.get()); 156 165 166 #if OGRE_VERSION >= 0x010900 167 safeObjectDelete(&overlaySystem_); 168 #endif 157 169 safeObjectDelete(&ogreRoot_); 158 170 safeObjectDelete(&ogreLogger_);
Note: See TracChangeset
for help on using the changeset viewer.