1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 10:23:56 +00:00

Merge remote branch 'scrawl/shutdowncrash'

This commit is contained in:
Marc Zinnschlag 2012-06-27 09:05:12 +02:00
commit 2603bca7d0
2 changed files with 1 additions and 3 deletions

View file

@ -114,7 +114,7 @@ void OgreRenderer::createWindow(const std::string &title, const WindowSettings&
// create the semi-transparent black background texture used by the GUI. // create the semi-transparent black background texture used by the GUI.
// has to be created in code with TU_DYNAMIC_WRITE_ONLY_DISCARDABLE param // has to be created in code with TU_DYNAMIC_WRITE_ONLY_DISCARDABLE param
// so that it can be modified at runtime. // so that it can be modified at runtime.
mTransparentBGTexture = Ogre::TextureManager::getSingleton().createManual( Ogre::TextureManager::getSingleton().createManual(
"transparent.png", "transparent.png",
Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME,
Ogre::TEX_TYPE_2D, Ogre::TEX_TYPE_2D,

View file

@ -74,8 +74,6 @@ namespace OEngine
Fader* mFader; Fader* mFader;
bool logging; bool logging;
Ogre::TexturePtr mTransparentBGTexture;
public: public:
OgreRenderer() OgreRenderer()
: mRoot(NULL) : mRoot(NULL)