diff options
author | jvoisin <julien.voisin@dustri.org> | 2022-01-15 17:17:18 +0000 |
---|---|---|
committer | jvoisin <julien.voisin@dustri.org> | 2022-01-15 17:17:18 +0000 |
commit | 2142e4b241b6b79cc02d7967b399c96d012aaedd (patch) | |
tree | 7bd3b5e00e4da839df0f869c023f717b8b63df62 | |
parent | ae641811cfd367a750894c5e5e5fcaeb4484caad (diff) | |
parent | 5fcb2cabc8c85b01bae855c74742638b84325ad0 (diff) |
Merge branch 'scale_your_guar' into 'master'
Make scaleObject a no-op when not changing scale
Closes #6551
See merge request OpenMW/openmw!1559
-rw-r--r-- | apps/openmw/mwworld/worldimp.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp index 325e048958..f6e00d3e21 100644 --- a/apps/openmw/mwworld/worldimp.cpp +++ b/apps/openmw/mwworld/worldimp.cpp @@ -1283,15 +1283,14 @@ namespace MWWorld void World::scaleObject (const Ptr& ptr, float scale) { + if (scale == ptr.getCellRef().getScale()) + return; if (mPhysics->getActor(ptr)) mNavigator->removeAgent(getPathfindingHalfExtents(ptr)); - if (scale != ptr.getCellRef().getScale()) - { - ptr.getCellRef().setScale(scale); - mRendering->pagingBlacklistObject(mStore.find(ptr.getCellRef().getRefId()), ptr); - mWorldScene->removeFromPagedRefs(ptr); - } + ptr.getCellRef().setScale(scale); + mRendering->pagingBlacklistObject(mStore.find(ptr.getCellRef().getRefId()), ptr); + mWorldScene->removeFromPagedRefs(ptr); if(ptr.getRefData().getBaseNode() != nullptr) mWorldScene->updateObjectScale(ptr); |