Merge branch 'lifetime' into 'master'

Maybe fix #6071

Closes #6071

See merge request OpenMW/openmw!1010

(cherry picked from commit 64750820957773a00d449d29551bb15fbf5fe08b)

1650dabe Assign the return value of weak_ptr::lock() to a variable, so that the
pull/593/head
psi29a 4 years ago
parent 8530bc5cf5
commit d1c0cfa524

@ -599,7 +599,7 @@ namespace MWPhysics
if (!mRemainingSteps)
return;
for (auto& data : mActorsFrameData)
if (data.mActor.lock())
if (const auto actor = data.mActor.lock())
{
std::unique_lock lock(mCollisionWorldMutex);
MovementSolver::unstuck(data, mCollisionWorld);

Loading…
Cancel
Save