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

handle missing land texture records properly during merge

Browse source
This commit is contained in:
Marc Zinnschlag 2015-09-08 16:01:34 +02:00
parent 73f6efddcc
commit 09ec60fe2a
1 changed files with 28 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/opencs/model/tools/mergestages.cpp
View file

@ -164,6 +164,10 @@ void CSMTools::MergeLandTexturesStage::perform (int stage, CSMDoc::Messages& mes
if (stage==0)
mNext = mState.mTextureIndices.begin();
bool found = false;
do
{
if (mNext==mState.mTextureIndices.end())
return;
@ -189,10 +193,13 @@ void CSMTools::MergeLandTexturesStage::perform (int stage, CSMDoc::Messages& mes
CSMWorld::RecordBase::State_ModifiedOnly, 0, &texture);
mState.mTarget->getData().getLandTextures().appendRecord (newRecord);
found = true;
}
/// \todo deal with missing textures (either abort merge or report and make sure OpenMW can deal with missing textures)
++mNext;
}
while (!found);
}