mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-27 10:36:49 +00:00
Code Issues Releases Wiki Activity

various minor fixes

Browse source
This commit is contained in:
Marc Zinnschlag 2015-09-10 12:41:31 +02:00
parent 09ec60fe2a
commit 584a7a66b9
1 changed files with 17 additions and 14 deletions

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

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