summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Strømme <christian.stromme@qt.io>2019-02-21 14:23:49 +0100
committerChristian Strømme <christian.stromme@qt.io>2019-02-26 13:50:27 +0000
commit7c062ac8036da56544a08d833aa474ec1b96fa94 (patch)
tree9bc1fe73d9da15471bd1af0a99d45bdd619aa2de
parent50b304d7585f8b1dda030e721aa78fb2bb63ac37 (diff)
Fix uninitialized variable in the animation component
Change-Id: Icebf9326a46650421e052bd972f5920e6812f7b8 Reviewed-by: Svenn-Arne Dragly <svenn-arne.dragly@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
-rw-r--r--src/runtime/slideplayerng/q3dsanimationmanagerng.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/runtime/slideplayerng/q3dsanimationmanagerng.cpp b/src/runtime/slideplayerng/q3dsanimationmanagerng.cpp
index 664d049..4469232 100644
--- a/src/runtime/slideplayerng/q3dsanimationmanagerng.cpp
+++ b/src/runtime/slideplayerng/q3dsanimationmanagerng.cpp
@@ -143,8 +143,8 @@ static void buildAnimationData(const Q3DSSlide::AnimationTrackList &tracks,
component.type = Q3DSAnimationData::DataType::Component;
component.componentData.component = comp;
component.componentData.size = quint16(track.keyFrames().size());
- if (track.isDynamic())
- component.componentData.componentFlags = Q3DSAnimationData::ComponentFlags(component.componentData.componentFlags | Q3DSAnimationData::ComponentFlags::Dynamic);
+ component.componentData.componentFlags = track.isDynamic() ? Q3DSAnimationData::ComponentFlags::Dynamic
+ : Q3DSAnimationData::ComponentFlags::None;
animationDataList->push_back(component);
// 2. Add key frames for component track