summaryrefslogtreecommitdiffstats
path: root/src/animation
diff options
context:
space:
mode:
authorAntti Määttä <antti.maatta@qt.io>2017-02-13 15:14:04 +0200
committerJani Heikkinen <jani.heikkinen@qt.io>2017-05-09 09:00:18 +0000
commit2daf7fbf486ac3e3265df2d6b6864b4d21826052 (patch)
treeaafe5c8504dd8f9265ec556c6aec224455d8766d /src/animation
parentcdf18bafbfbfcc2f7cf178ab0fe23ac9f7cf717a (diff)
Add quick3d class for VertexBlendAnimation
Add the missing class for VertexBlendAnimation so that it can be used from qml. Task-number: QTBUG-60618 Change-Id: If47dccf5e44d0158053ca3b9122fcef91d73ea93 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/animation')
-rw-r--r--src/animation/frontend/qvertexblendanimation.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/animation/frontend/qvertexblendanimation.cpp b/src/animation/frontend/qvertexblendanimation.cpp
index efc36e45c..3ddd83bf0 100644
--- a/src/animation/frontend/qvertexblendanimation.cpp
+++ b/src/animation/frontend/qvertexblendanimation.cpp
@@ -125,7 +125,7 @@ namespace Qt3DAnimation {
\readonly
*/
/*!
- \qmlproperty VertexBlendAnimation::target
+ \qmlproperty GeometryRenderer VertexBlendAnimation::target
Holds the target GeometryRenderer the morphing animation is applied to.
*/
/*!
@@ -135,6 +135,10 @@ namespace Qt3DAnimation {
is usually same as the name of the parent entity of the target GeometryRenderer, but
does not have to be.
*/
+/*!
+ \qmlproperty list<MorphTarget> VertexBlendAnimation::morphTargets
+ Holds the list of \l {MorphTarget}{morph targets} added to the animation.
+*/
QVertexBlendAnimationPrivate::QVertexBlendAnimationPrivate()
: QAbstractAnimationPrivate(QAbstractAnimation::VertexBlendAnimation)