mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-22 22:09:44 +00:00
Code Issues Releases Wiki Activity

Make scaleObject a no-op when not changing scale

Browse source
This commit is contained in:
Evil Eye 2022-01-15 13:04:15 +01:00
parent c33534f468
commit 5fcb2cabc8
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/openmw/mwworld/worldimp.cpp
View file

@ -1283,15 +1283,14 @@ namespace MWWorld
void World::scaleObject (const Ptr& ptr, float scale) void World::scaleObject (const Ptr& ptr, float scale)
{ {
if (scale == ptr.getCellRef().getScale())
return;
if (mPhysics->getActor(ptr)) if (mPhysics->getActor(ptr))
mNavigator->removeAgent(getPathfindingHalfExtents(ptr)); mNavigator->removeAgent(getPathfindingHalfExtents(ptr));
if (scale != ptr.getCellRef().getScale())
{
ptr.getCellRef().setScale(scale); ptr.getCellRef().setScale(scale);
mRendering->pagingBlacklistObject(mStore.find(ptr.getCellRef().getRefId()), ptr); mRendering->pagingBlacklistObject(mStore.find(ptr.getCellRef().getRefId()), ptr);
mWorldScene->removeFromPagedRefs(ptr); mWorldScene->removeFromPagedRefs(ptr);
}
if(ptr.getRefData().getBaseNode() != nullptr) if(ptr.getRefData().getBaseNode() != nullptr)
mWorldScene->updateObjectScale(ptr); mWorldScene->updateObjectScale(ptr);