mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-07 13:20:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'scale_your_guar' into 'master'

Browse Source 
Make scaleObject a no-op when not changing scale

Closes #6551

See merge request OpenMW/openmw!1559
This commit is contained in:
jvoisin 2022-01-15 17:17:18 +00:00
commit 2142e4b241
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
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);
{ mRendering->pagingBlacklistObject(mStore.find(ptr.getCellRef().getRefId()), ptr);
ptr.getCellRef().setScale(scale); mWorldScene->removeFromPagedRefs(ptr);
mRendering->pagingBlacklistObject(mStore.find(ptr.getCellRef().getRefId()), ptr);
mWorldScene->removeFromPagedRefs(ptr);
}
if(ptr.getRefData().getBaseNode() != nullptr) if(ptr.getRefData().getBaseNode() != nullptr)
mWorldScene->updateObjectScale(ptr); mWorldScene->updateObjectScale(ptr);