teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Fix errors due to BaseWhite material being removed

Browse source
This commit is contained in:
scrawl 2014-05-31 19:49:48 +02:00
parent 0f1b39bca4
commit 7c9c0830a9
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
components/terrain/chunk.cpp
View file

@ -4,6 +4,7 @@
#include <OgreHardwareBufferManager.h> #include <OgreHardwareBufferManager.h>
#include <OgreRenderQueue.h> #include <OgreRenderQueue.h>
#include <OgreMaterialManager.h> #include <OgreMaterialManager.h>
#include <OgreStringConverter.h>
#include <extern/shiny/Main/Factory.hpp> #include <extern/shiny/Main/Factory.hpp>
@ -56,7 +57,11 @@ namespace Terrain
mVertexData->vertexBufferBinding->setBinding(3, colourBuffer); mVertexData->vertexBufferBinding->setBinding(3, colourBuffer);
// Assign a default material in case terrain material fails to be created // Assign a default material in case terrain material fails to be created
mMaterial = Ogre::MaterialManager::getSingleton().getByName("BaseWhite"); // Since we are removing this material in the destructor, it must be cloned from BaseWhite
// so the original always stays available.
static int materialCount=0;
mMaterial = Ogre::MaterialManager::getSingleton().getByName("BaseWhite")
->clone("BaseWhite"+Ogre::StringConverter::toString(++materialCount));
mIndexData = OGRE_NEW Ogre::IndexData(); mIndexData = OGRE_NEW Ogre::IndexData();
mIndexData->indexStart = 0; mIndexData->indexStart = 0;