diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-16 03:01:10 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-16 03:01:10 +0200 |
| commit | 8b74455c1fb52852b3eb2401385d28cd0f4e9a6f (patch) | |
| tree | d0a54a8cafacdef71176c1be37356bdb5b5d33a7 /src/render/backend | |
| parent | eacf5d4302aa161cf146df68bf18bb4093b13574 (diff) | |
| parent | b63aaf574c6b4b5a40e2f137f077c694bcf79ae0 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I0f68ab1277617c32b1c31f29d8793d23d9909208
Diffstat (limited to 'src/render/backend')
| -rw-r--r-- | src/render/backend/managers.cpp | 6 | ||||
| -rw-r--r-- | src/render/backend/managers_p.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/render/backend/managers.cpp b/src/render/backend/managers.cpp index 26fd68600..aa7dbb741 100644 --- a/src/render/backend/managers.cpp +++ b/src/render/backend/managers.cpp @@ -110,6 +110,12 @@ void JointManager::addDirtyJoint(Qt3DCore::QNodeId jointId) m_dirtyJoints.push_back(jointHandle); } +void JointManager::removeDirtyJoint(Qt3DCore::QNodeId jointId) +{ + const HJoint jointHandle = lookupHandle(jointId); + m_dirtyJoints.removeAll(jointHandle); +} + QVector<HJoint> JointManager::dirtyJoints() { return std::move(m_dirtyJoints); diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h index eb219fd1e..f28dbe768 100644 --- a/src/render/backend/managers_p.h +++ b/src/render/backend/managers_p.h @@ -433,6 +433,7 @@ class JointManager : public Qt3DCore::QResourceManager< { public: void addDirtyJoint(Qt3DCore::QNodeId jointId); + void removeDirtyJoint(Qt3DCore::QNodeId jointId); QVector<HJoint> dirtyJoints(); private: |