diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2017-01-31 11:57:02 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2017-01-31 14:09:55 +0000 |
| commit | c35f8e7c5f573fcc89b3042157d5843d9322ac90 (patch) | |
| tree | 441f70a284d957056d917842b76881fe6420b13e /src/animation/backend/blendedclipanimator.cpp | |
| parent | 26b1dd88d374b17314218584487a383e3d558018 (diff) | |
BlendedAnimations: allow nested blending nodes evaluation
Change-Id: Ic6a70ee57f56dff7406b5917d620ea15b74ecb44
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/animation/backend/blendedclipanimator.cpp')
| -rw-r--r-- | src/animation/backend/blendedclipanimator.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/animation/backend/blendedclipanimator.cpp b/src/animation/backend/blendedclipanimator.cpp index 1cb774f72..e2e58c8de 100644 --- a/src/animation/backend/blendedclipanimator.cpp +++ b/src/animation/backend/blendedclipanimator.cpp @@ -74,7 +74,7 @@ void BlendedClipAnimator::cleanup() m_startGlobalTime = 0; m_currentLoop = 0; m_loops = 1; - m_mappingData.clear(); + m_blendTreeTable.clear(); } void BlendedClipAnimator::setBlendTreeRootId(Qt3DCore::QNodeId blendTreeId) @@ -95,11 +95,6 @@ void BlendedClipAnimator::setRunning(bool running) setDirty(Handler::BlendedClipAnimatorDirty); } -void BlendedClipAnimator::setMappingData(const QVector<AnimationUtils::BlendingMappingData> mappingData) -{ - m_mappingData = mappingData; -} - void BlendedClipAnimator::sendPropertyChanges(const QVector<Qt3DCore::QSceneChangePtr> &changes) { for (const Qt3DCore::QSceneChangePtr &change : changes) |