diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-02-22 13:59:57 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-02-24 20:41:40 +0000 |
| commit | 28938073a228a38c2a5beccdb3357b5a8c172def (patch) | |
| tree | d30c31310ce68fbdbc463e84225ecbac00f286db /src/animation/frontend/qanimationaspect.cpp | |
| parent | de28bb3aafdfc2dec80aa65cd426bf2b74718358 (diff) | |
Rename QAdditiveBlend -> QAdditiveClipBlend
Also rename backend type accordingly.
Task-number: QTBUG-58903
Change-Id: Ia1ad670937487dd84768e79d8c2be59ed3b6d0a5
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
Diffstat (limited to 'src/animation/frontend/qanimationaspect.cpp')
| -rw-r--r-- | src/animation/frontend/qanimationaspect.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/animation/frontend/qanimationaspect.cpp b/src/animation/frontend/qanimationaspect.cpp index 2fac063c2..56dd012ed 100644 --- a/src/animation/frontend/qanimationaspect.cpp +++ b/src/animation/frontend/qanimationaspect.cpp @@ -45,12 +45,12 @@ #include <Qt3DAnimation/qchannelmapping.h> #include <Qt3DAnimation/qchannelmapper.h> #include <Qt3DAnimation/qlerpclipblend.h> -#include <Qt3DAnimation/qadditiveblend.h> +#include <Qt3DAnimation/qadditiveclipblend.h> #include <Qt3DAnimation/private/handler_p.h> #include <Qt3DAnimation/private/managers_p.h> #include <Qt3DAnimation/private/nodefunctor_p.h> #include <Qt3DAnimation/private/lerpclipblend_p.h> -#include <Qt3DAnimation/private/additiveblend_p.h> +#include <Qt3DAnimation/private/additiveclipblend_p.h> QT_BEGIN_NAMESPACE @@ -109,9 +109,9 @@ QAnimationAspect::QAnimationAspect(QAnimationAspectPrivate &dd, QObject *parent) registerBackendType<QLerpClipBlend>( QSharedPointer<Animation::ClipBlendNodeFunctor<Animation::LerpClipBlend, Animation::ClipAnimatorManager>>::create(d->m_handler.data(), d->m_handler->clipBlendNodeManager())); - registerBackendType<QAdditiveBlend>( - QSharedPointer<Animation::ClipBlendNodeFunctor<Animation::AdditiveBlend, Animation::ClipAnimatorManager>>::create(d->m_handler.data(), - d->m_handler->clipBlendNodeManager())); + registerBackendType<QAdditiveClipBlend>( + QSharedPointer<Animation::ClipBlendNodeFunctor<Animation::AdditiveClipBlend, Animation::ClipAnimatorManager>>::create(d->m_handler.data(), + d->m_handler->clipBlendNodeManager())); } /*! \internal */ |