diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-14 12:02:47 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-14 12:47:58 +0100 |
| commit | 1382b0cfb336cc04924d61b46f0b69dadb1c3d39 (patch) | |
| tree | f7b5d12a0475d9d4ee5d4ba17fd02dc36ae96b97 /src/animation | |
| parent | f76259554244bf3fa3045e58c1f59f3eac1b6a03 (diff) | |
| parent | 31f424bb81cd2583920d3d521e1e01f01c2d28e2 (diff) | |
Merge remote-tracking branch 'origin/5.10.1' into 5.11
Conflicts:
src/render/backend/renderer.cpp
src/render/backend/renderer_p.h
tests/auto/render/renderer/tst_renderer.cpp
Done-with: Svenn-Arne Dragly <svenn-arne.dragly@qt.io>
Change-Id: I2ca9bac4777e51434579edf86030414734f533ac
Diffstat (limited to 'src/animation')
| -rw-r--r-- | src/animation/backend/animationutils_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/animation/backend/animationutils_p.h b/src/animation/backend/animationutils_p.h index 01816bda2..42402c5ec 100644 --- a/src/animation/backend/animationutils_p.h +++ b/src/animation/backend/animationutils_p.h @@ -145,6 +145,7 @@ struct ChannelNameAndType , jointIndex(-1) , mappingId() , jointTransformComponent(NoTransformComponent) + , pad(0) {} ChannelNameAndType(const QString &_name, @@ -157,6 +158,7 @@ struct ChannelNameAndType , jointIndex(_jointIndex) , mappingId(_mappingId) , jointTransformComponent(NoTransformComponent) + , pad(0) {} ChannelNameAndType(const QString &_name, @@ -168,6 +170,7 @@ struct ChannelNameAndType , jointIndex(invalidIndex) , mappingId() , jointTransformComponent(_jointTransformComponent) + , pad(0) {} bool operator==(const ChannelNameAndType &rhs) const |