mirror of
https://github.com/OpenMW/openmw.git
synced 2025-02-21 06:39:42 +00:00
Make scaleObject a no-op when not changing scale
This commit is contained in:
parent
c33534f468
commit
5fcb2cabc8
1 changed files with 5 additions and 6 deletions
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue