Changeset 11130 for code/branches/ogre1.9/src/modules

Timestamp:

Mar 6, 2016, 4:13:15 PM (9 years ago)

Author:

landauf

Message:

forgot to commit 2 files in my previous commit:
orxonox now compiles with ogre 1.9 (but still needs some other changes)

Location:

code/branches/ogre1.9/src/modules

Files:

• designtools/ScreenshotManager.cc (modified) (1 diff)
• hover/FlagHUD.cc (modified) (1 diff)

code/branches/ogre1.9/src/modules/designtools/ScreenshotManager.cc

@@ -101 +101 @@
         }
         if(!this->tempTexture_.isNull())
-            this->tempTexture_.freeMethod();
+            this->tempTexture_.setNull();
     }
     

code/branches/ogre1.9/src/modules/hover/FlagHUD.cc

@@ -32 +32 @@
 #include "FlagHUD.h"
 
-#include <OgreOverlayManager.h>
-#include <OgreMaterialManager.h>
-#include <OgrePanelOverlayElement.h>
+#if OGRE_VERSION >= 0x010900
+#   include <Overlay/OgreOverlayManager.h>
+#   include <Overlay/OgrePanelOverlayElement.h>
+#else
+#   include <OgreOverlayManager.h>
+#   include <OgrePanelOverlayElement.h>
+#endif
 
 #include "util/StringUtils.h"