summaryrefslogtreecommitdiffstats
path: root/src/animation
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2019-08-19 10:35:04 +0200
committerPaul Lemire <paul.lemire@kdab.com>2019-08-26 08:15:42 +0200
commit4e2c04a3bb3391ae00a43e83c76451154087a41d (patch)
treee570480ba499aaf4ea31ceeee6c620f13f1c9f8d /src/animation
parent9517e406e64ae0d28e83c49334d8e7dc854516ef (diff)
Animations: don't assert if mapper is not set
We might provide it later, current approach forces it to be set at construction time which doesn't work if you use delayed loading of meshes and mappers. Change-Id: I8ee95d4751cb951d3a99c2fb80b1d5ba77905a2d Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src/animation')
-rw-r--r--src/animation/backend/buildblendtreesjob.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/animation/backend/buildblendtreesjob.cpp b/src/animation/backend/buildblendtreesjob.cpp
index be96889fa..3cfa81446 100644
--- a/src/animation/backend/buildblendtreesjob.cpp
+++ b/src/animation/backend/buildblendtreesjob.cpp
@@ -86,7 +86,8 @@ void BuildBlendTreesJob::run()
// Build the format for clip results that should be used by nodes in the blend
// tree when used with this animator
const ChannelMapper *mapper = m_handler->channelMapperManager()->lookupResource(blendClipAnimator->mapperId());
- Q_ASSERT(mapper);
+ if (!mapper)
+ continue;
const QVector<ChannelNameAndType> channelNamesAndTypes
= buildRequiredChannelsAndTypes(m_handler, mapper);
const QVector<ComponentIndices> channelComponentIndices