summaryrefslogtreecommitdiffstats
path: root/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2017-02-22 13:59:57 +0000
committerSean Harmer <sean.harmer@kdab.com>2017-02-24 20:41:40 +0000
commit28938073a228a38c2a5beccdb3357b5a8c172def (patch)
treed30c31310ce68fbdbc463e84225ecbac00f286db /src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp
parentde28bb3aafdfc2dec80aa65cd426bf2b74718358 (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/quick3d/imports/animation/qt3dquick3danimationplugin.cpp')
-rw-r--r--src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp b/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp
index 6f52de389..29b4fe076 100644
--- a/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp
+++ b/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp
@@ -45,7 +45,7 @@
#include <Qt3DAnimation/qclipanimator.h>
#include <Qt3DAnimation/qchannelmapping.h>
#include <Qt3DAnimation/qlerpclipblend.h>
-#include <Qt3DAnimation/qadditiveblend.h>
+#include <Qt3DAnimation/qadditiveclipblend.h>
#include <Qt3DAnimation/qkeyframeanimation.h>
#include <Qt3DAnimation/qanimationcontroller.h>
@@ -81,8 +81,8 @@ void Qt3DQuick3DAnimationPlugin::registerTypes(const char *uri)
Qt3DAnimation::Animation::Quick::Quick3DChannelMapper>(uri, 2, 9, "ChannelMapper");
qmlRegisterExtendedUncreatableType<Qt3DAnimation::QAbstractClipBlendNode,
Qt3DAnimation::Animation::Quick::Quick3DAbstractClipBlendNode>(uri, 2, 9, "AbstractClipBlendNode", QStringLiteral("QAbstractClipBlendNode is abstract"));
- qmlRegisterType<Qt3DAnimation::QAdditiveBlend>(uri, 2, 9, "AdditiveBlend");
qmlRegisterType<Qt3DAnimation::QLerpClipBlend>(uri, 2, 9, "LerpClipBlend");
+ qmlRegisterType<Qt3DAnimation::QAdditiveClipBlend>(uri, 2, 9, "AdditiveClipBlend");
qmlRegisterUncreatableType<Qt3DAnimation::QAbstractAnimation>(uri, 2, 9, "AbstractAnimation", QStringLiteral("AbstractAnimation is abstract"));
qmlRegisterExtendedType<Qt3DAnimation::QKeyframeAnimation, Qt3DAnimation::Quick::QQuick3DKeyframeAnimation>(uri, 2, 9, "KeyframeAnimation");