From ba1b3ae962374bd1f5c9216fec78bd053a9856d2 Mon Sep 17 00:00:00 2001 From: elsid Date: Sat, 19 Aug 2023 01:29:08 +0200 Subject: [PATCH] Avoid duplicated addEntryToObjectCache call --- apps/openmw/mwrender/landmanager.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/openmw/mwrender/landmanager.cpp b/apps/openmw/mwrender/landmanager.cpp index 87c235eaa7..c2775679bc 100644 --- a/apps/openmw/mwrender/landmanager.cpp +++ b/apps/openmw/mwrender/landmanager.cpp @@ -24,25 +24,25 @@ namespace MWRender return static_cast(obj.get()); const MWBase::World& world = *MWBase::Environment::get().getWorld(); + osg::ref_ptr landObj = nullptr; if (ESM::isEsm4Ext(cellIndex.mWorldspace)) { const ESM4::Land* land = world.getStore().get().search(cellIndex); if (land == nullptr) return nullptr; - osg::ref_ptr landObj(new ESMTerrain::LandObject(*land, mLoadFlags)); - mCache->addEntryToObjectCache(cellIndex, landObj.get()); - return landObj; + landObj = new ESMTerrain::LandObject(*land, mLoadFlags); } else { const ESM::Land* land = world.getStore().get().search(cellIndex.mX, cellIndex.mY); if (land == nullptr) return nullptr; - osg::ref_ptr landObj(new ESMTerrain::LandObject(*land, mLoadFlags)); - mCache->addEntryToObjectCache(cellIndex, landObj.get()); - return landObj; + landObj = new ESMTerrain::LandObject(*land, mLoadFlags); } + + mCache->addEntryToObjectCache(cellIndex, landObj.get()); + return landObj; } void LandManager::reportStats(unsigned int frameNumber, osg::Stats* stats) const