diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2017-01-31 12:26:27 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2017-01-31 14:10:02 +0000 |
| commit | 68606da9f12482a7bd910dccc53daf2899082526 (patch) | |
| tree | fb30dfa73edfb89117d361217fd63028ea74db99 /src/quick3d/imports | |
| parent | 7416cf5ecff88cff4ab312271322d8fb281cf68f (diff) | |
Renamed QAddBlend to QAdditiveBlend
Change-Id: I1a2737c335790507c3b598e274f8dc5f8f82d1a1
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/imports')
| -rw-r--r-- | src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp b/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp index 9918e22b2..85c2afee9 100644 --- a/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp +++ b/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp @@ -44,7 +44,7 @@ #include <Qt3DAnimation/qconductedclipanimator.h> #include <Qt3DAnimation/qchannelmapping.h> #include <Qt3DAnimation/qlerpblend.h> -#include <Qt3DAnimation/qaddblend.h> +#include <Qt3DAnimation/qadditiveblend.h> #include <Qt3DQuickAnimation/private/qt3dquickanimation_global_p.h> #include <Qt3DQuickAnimation/private/quick3dchannelmapper_p.h> #include <Qt3DQuickAnimation/private/quick3dabstractclipblendnode_p.h> @@ -66,7 +66,7 @@ void Qt3DQuick3DAnimationPlugin::registerTypes(const char *uri) qmlRegisterExtendedUncreatableType<Qt3DAnimation::QAbstractClipBlendNode, Qt3DAnimation::Animation::Quick::Quick3DAbstractClipBlendNode>(uri, 2, 2, "AbstractClipBlendNode", QStringLiteral("QAbstractClipBlendNode is abstract")); qmlRegisterType<Qt3DAnimation::QLerpBlend>(uri, 2, 2, "LerpBlend"); - qmlRegisterType<Qt3DAnimation::QAddBlend>(uri, 2, 2, "AddBlend"); + qmlRegisterType<Qt3DAnimation::QAdditiveBlend>(uri, 2, 2, "AdditiveBlend"); } QT_END_NAMESPACE |