diff options
| author | Mike Krus <mike.krus@kdab.com> | 2019-10-20 18:46:16 +0100 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2019-10-21 09:52:59 +0100 |
| commit | 3281951ccc9b607ffaf41d8425b3e3cce3936fd1 (patch) | |
| tree | 58abafd7b2092eb0559d497a63e1522385303d43 /src/animation/frontend | |
| parent | ce4663c2659d9e1611a1647a9b3cd26da8a80604 (diff) | |
Fix Coverity warnings
Change-Id: I00c875b48d838170fddf0b92f0ac5592828c6f0f
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/animation/frontend')
| -rw-r--r-- | src/animation/frontend/qabstractchannelmapping.cpp | 1 | ||||
| -rw-r--r-- | src/animation/frontend/qvertexblendanimation.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/animation/frontend/qabstractchannelmapping.cpp b/src/animation/frontend/qabstractchannelmapping.cpp index 3249e6876..599ec6ed7 100644 --- a/src/animation/frontend/qabstractchannelmapping.cpp +++ b/src/animation/frontend/qabstractchannelmapping.cpp @@ -46,6 +46,7 @@ namespace Qt3DAnimation { QAbstractChannelMappingPrivate::QAbstractChannelMappingPrivate() : Qt3DCore::QNodePrivate() + , m_mappingType(QChannelMappingCreatedChangeBase::ChannelMapping) { } diff --git a/src/animation/frontend/qvertexblendanimation.cpp b/src/animation/frontend/qvertexblendanimation.cpp index 25468d4a7..143b9553a 100644 --- a/src/animation/frontend/qvertexblendanimation.cpp +++ b/src/animation/frontend/qvertexblendanimation.cpp @@ -192,8 +192,8 @@ void QVertexBlendAnimationPrivate::updateAnimation(float position) Qt3DRender::QGeometry *geometry = m_target->geometry(); // remove attributes from previous frame - if ((m_currentBase && (base != m_currentBase)) - || (m_currentTarget && (target != m_currentTarget))) { + if (m_currentBase && m_currentTarget && + (base != m_currentBase || target != m_currentTarget)) { const QVector<Qt3DRender::QAttribute *> baseAttributes = m_currentBase->attributeList(); const QVector<Qt3DRender::QAttribute *> targetAttributes = m_currentTarget->attributeList(); for (int i = 0; i < baseAttributes.size(); ++i) { |