Merge branch 'animationblendingcoverity' into 'master'

Make Coverity happy about animation blending

See merge request OpenMW/openmw!4276
pull/3236/head
psi29a 5 months ago
commit 11f25e4448

@ -143,6 +143,11 @@ namespace MWRender
setKeyframeTrack(keyframeTrack, newState, blendRules);
}
AnimBlendController::AnimBlendController()
: mEasingFn(&Easings::sineOut)
{
}
NifAnimBlendController::NifAnimBlendController(const osg::ref_ptr<SceneUtil::KeyframeController>& keyframeTrack,
const AnimBlendStateData& newState, const osg::ref_ptr<const SceneUtil::AnimBlendRules>& blendRules)
: AnimBlendController(keyframeTrack, newState, blendRules)

@ -30,7 +30,7 @@ namespace MWRender
AnimBlendController(const osg::ref_ptr<SceneUtil::KeyframeController>& keyframeTrack,
const AnimBlendStateData& animState, const osg::ref_ptr<const SceneUtil::AnimBlendRules>& blendRules);
AnimBlendController() {}
AnimBlendController();
void setKeyframeTrack(const osg::ref_ptr<SceneUtil::KeyframeController>& kft,
const AnimBlendStateData& animState, const osg::ref_ptr<const SceneUtil::AnimBlendRules>& blendRules);
@ -111,7 +111,7 @@ namespace MWRender
{
public:
BoneAnimBlendControllerWrapper(osg::ref_ptr<BoneAnimBlendController> rootCallback, osgAnimation::Bone* node)
: mRootCallback(rootCallback)
: mRootCallback(std::move(rootCallback))
, mNode(node)
{
}
@ -135,7 +135,7 @@ namespace MWRender
private:
osg::ref_ptr<BoneAnimBlendController> mRootCallback;
osgAnimation::Bone* mNode;
osgAnimation::Bone* mNode{ nullptr };
};
}

@ -30,7 +30,7 @@ namespace SceneUtil
if (delimiterInd == std::string::npos)
{
group = full;
group = std::move(full);
Misc::StringUtils::trim(group);
}
else

Loading…
Cancel
Save