diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-16 01:01:37 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-16 01:01:37 +0200 |
| commit | 67481cae7e1aa6e560eaca94bfa5c14bfa8edc25 (patch) | |
| tree | 714eb8ce3dfc4816718562b1286b5ca6c711628a /src/particles/qquickimageparticle_p.h | |
| parent | bccf872b94944dfa476ccedc1d1a45d380703e15 (diff) | |
| parent | 383854f482a34cef14f918c2a3172522249ef542 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I6e69a235f50472b8f7ac19e133a3c071ea8c4d7a
Diffstat (limited to 'src/particles/qquickimageparticle_p.h')
| -rw-r--r-- | src/particles/qquickimageparticle_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/particles/qquickimageparticle_p.h b/src/particles/qquickimageparticle_p.h index 83fc75e9c9..fdb404861c 100644 --- a/src/particles/qquickimageparticle_p.h +++ b/src/particles/qquickimageparticle_p.h @@ -390,6 +390,7 @@ private: QColor m_color; qreal m_color_variation; + QSGNode *m_outgoingNode; QHash<int, QSGGeometryNode *> m_nodes; QHash<int, int> m_idxStarts;//TODO: Proper resizing will lead to needing a spriteEngine per particle - do this after sprite engine gains transparent sharing? QList<QPair<int, int> > m_startsIdx;//Same data, optimized for alternate retrieval |