AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-30 16:45:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

various minor fixes

Browse Source 
(cherry picked from commit 584a7a66b97739c91c38cf8f17922ba29d5536e2)
This commit is contained in:
Marc Zinnschlag 2015-09-10 12:41:31 +02:00 committed by cc9cii
parent dcf1f1515a
commit 4aa6d7d1d1
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/opencs/model/tools/mergestages.cpp
View File

@ -124,7 +124,7 @@ void CSMTools::ListLandTexturesMergeStage::perform (int stage, CSMDoc::Messages&
if (!record.isDeleted())
{
const ESM::Land& land = record.get();
const CSMWorld::Land& land = record.get();
// make sure record is loaded
land.loadData (ESM::Land::DATA_VHGT | ESM::Land::DATA_VNML |
@ -228,6 +228,8 @@ void CSMTools::MergeLandStage::perform (int stage, CSMDoc::Messages& messages)
// because record is already fully loaded)
newLand.mPlugin = 0;
if (land.mDataTypes & ESM::Land::DATA_VTEX)
{
// adjust land texture references
if (ESM::Land::LandData *data = newLand.getLandData())
{
@ -246,6 +248,7 @@ void CSMTools::MergeLandStage::perform (int stage, CSMDoc::Messages& messages)
data->mTextures[i] = 0;
}
}
}
CSMWorld::Record<CSMWorld::Land> newRecord (
CSMWorld::RecordBase::State_ModifiedOnly, 0, &newLand);