1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-23 06:41:08 +00:00

Merge branch 'fix_formatting' into 'master'

Fix formatting to make clang-format pass

See merge request OpenMW/openmw!3826
This commit is contained in:
Alexei Kotov 2024-02-01 02:15:51 +00:00
commit 2114f84939

View File

@ -463,8 +463,8 @@ namespace MWRender
if (torch != inv.end() && torch->getType() == ESM::Light::sRecordId && showCarriedLeft) if (torch != inv.end() && torch->getType() == ESM::Light::sRecordId && showCarriedLeft)
{ {
if (!mAnimation->getInfo("torch")) if (!mAnimation->getInfo("torch"))
mAnimation->play( mAnimation->play("torch", 2, BlendMask::BlendMask_LeftArm, false, 1.0f, "start", "stop", 0.0f,
"torch", 2, BlendMask::BlendMask_LeftArm, false, 1.0f, "start", "stop", 0.0f, std::numeric_limits<uint32_t>::max(), true); std::numeric_limits<uint32_t>::max(), true);
} }
else if (mAnimation->getInfo("torch")) else if (mAnimation->getInfo("torch"))
mAnimation->disable("torch"); mAnimation->disable("torch");