Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11130


Ignore:
Timestamp:
Mar 6, 2016, 4:13:15 PM (4 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:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/ogre1.9/src/modules/designtools/ScreenshotManager.cc

    r11071 r11130  
    101101        }
    102102        if(!this->tempTexture_.isNull())
    103             this->tempTexture_.freeMethod();
     103            this->tempTexture_.setNull();
    104104    }
    105105   
  • code/branches/ogre1.9/src/modules/hover/FlagHUD.cc

    r11071 r11130  
    3232#include "FlagHUD.h"
    3333
    34 #include <OgreOverlayManager.h>
    35 #include <OgreMaterialManager.h>
    36 #include <OgrePanelOverlayElement.h>
     34#if OGRE_VERSION >= 0x010900
     35#   include <Overlay/OgreOverlayManager.h>
     36#   include <Overlay/OgrePanelOverlayElement.h>
     37#else
     38#   include <OgreOverlayManager.h>
     39#   include <OgrePanelOverlayElement.h>
     40#endif
    3741
    3842#include "util/StringUtils.h"
Note: See TracChangeset for help on using the changeset viewer.