[Orxonox-commit 6483] r11130 - in code/branches/ogre1.9/src/modules: designtools hover

[landauf at orxonox.net]

Author: landauf
Date: 2016-03-06 16:13:15 +0100 (Sun, 06 Mar 2016)
New Revision: 11130

Modified:
   code/branches/ogre1.9/src/modules/designtools/ScreenshotManager.cc
   code/branches/ogre1.9/src/modules/hover/FlagHUD.cc
Log:
forgot to commit 2 files in my previous commit:
orxonox now compiles with ogre 1.9 (but still needs some other changes)

Modified: code/branches/ogre1.9/src/modules/designtools/ScreenshotManager.cc
===================================================================
--- code/branches/ogre1.9/src/modules/designtools/ScreenshotManager.cc	2016-03-06 14:32:26 UTC (rev 11129)
+++ code/branches/ogre1.9/src/modules/designtools/ScreenshotManager.cc	2016-03-06 15:13:15 UTC (rev 11130)
@@ -100,7 +100,7 @@
             this->data_ = nullptr;
         }
         if(!this->tempTexture_.isNull())
-            this->tempTexture_.freeMethod();
+            this->tempTexture_.setNull();
     }
     
     /**

Modified: code/branches/ogre1.9/src/modules/hover/FlagHUD.cc
===================================================================
--- code/branches/ogre1.9/src/modules/hover/FlagHUD.cc	2016-03-06 14:32:26 UTC (rev 11129)
+++ code/branches/ogre1.9/src/modules/hover/FlagHUD.cc	2016-03-06 15:13:15 UTC (rev 11130)
@@ -31,9 +31,13 @@
 
 #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"
 #include "core/CoreIncludes.h"