summaryrefslogtreecommitdiffstats
path: root/src/animation/backend/animationclip_p.h
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2017-08-26 17:31:10 +0100
committerSean Harmer <sean.harmer@kdab.com>2017-09-02 18:10:40 +0000
commit88d63171992f957ddbc6e46b094504ac2ea9aeba (patch)
treee94fe4d7c8c00ebafd1fbd9c5974a6170a7349b0 /src/animation/backend/animationclip_p.h
parentbbc14b772c323476a5cc41c1da06921f4e3dbf3e (diff)
Extend generateClipFormatIndices() to handle jointIndex
AnimationClip now matches on name and jointIndex if jointIndex is valid. Change-Id: Id2b3f41bf465a847048537583fc244743c0d026b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/animation/backend/animationclip_p.h')
-rw-r--r--src/animation/backend/animationclip_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/animation/backend/animationclip_p.h b/src/animation/backend/animationclip_p.h
index 7ff79c01a..5e5d54ac8 100644
--- a/src/animation/backend/animationclip_p.h
+++ b/src/animation/backend/animationclip_p.h
@@ -80,7 +80,7 @@ public:
void loadAnimation();
void setDuration(float duration);
float duration() const { return m_duration; }
- int channelIndex(const QString &channelName) const;
+ int channelIndex(const QString &channelName, int jointIndex) const;
int channelCount() const { return m_channelComponentCount; }
int channelComponentBaseIndex(int channelGroupIndex) const;