AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-15 15:30:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sillyphysics' into 'master'

Browse Source 
Stop postponing physics for objects that _don't_ have physics

Closes #8432

See merge request OpenMW/openmw!4658
This commit is contained in:
psi29a 2025-07-01 21:28:48 +00:00
commit ceac11d6df
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/openmw/mwworld/scene.cpp
View File

@ -375,7 +375,6 @@ namespace MWWorld
if (object->getShapeInstance()->mVisualCollisionType == Resource::VisualCollisionType::None) if (object->getShapeInstance()->mVisualCollisionType == Resource::VisualCollisionType::None)
mNavigator.removeObject(DetourNavigator::ObjectId(object), navigatorUpdateGuard); mNavigator.removeObject(DetourNavigator::ObjectId(object), navigatorUpdateGuard);
mPhysics->remove(ptr); mPhysics->remove(ptr);
ptr.mRef->mData.mPhysicsPostponed = false;
} }
else if (mPhysics->getActor(ptr)) else if (mPhysics->getActor(ptr))
{ {
@ -383,6 +382,8 @@ namespace MWWorld
mRendering.removeActorPath(ptr); mRendering.removeActorPath(ptr);
mPhysics->remove(ptr); mPhysics->remove(ptr);
} }
else
ptr.mRef->mData.mPhysicsPostponed = false;
MWBase::Environment::get().getLuaManager()->objectRemovedFromScene(ptr); MWBase::Environment::get().getLuaManager()->objectRemovedFromScene(ptr);
} }