Merge branch 'sillyphysics' into 'master'

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

View File

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