diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2019-06-03 12:29:29 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-06-03 12:29:52 +0200 |
| commit | 4eee1ab5a51ac482e2252e2e85c0fe624d5d4bad (patch) | |
| tree | 71fb24fc69b2f77e08a57c56011ee5b72f23a52a /src/render/jobs/updateskinningpalettejob_p.h | |
| parent | 79aa74b5d9df52605a8833e3853b422ca8e7a651 (diff) | |
| parent | 666a645d1edc98dfea92fdaf7eaeed10c86dbc56 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/render/renderers/opengl/renderer/renderer.cpp
tests/auto/render/textures/tst_textures.cpp
Change-Id: I4da0eafe7ddd4dd822c3dcb5f5fa826653a335b4
Diffstat (limited to 'src/render/jobs/updateskinningpalettejob_p.h')
| -rw-r--r-- | src/render/jobs/updateskinningpalettejob_p.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/render/jobs/updateskinningpalettejob_p.h b/src/render/jobs/updateskinningpalettejob_p.h index 9e230f143..c52e0841c 100644 --- a/src/render/jobs/updateskinningpalettejob_p.h +++ b/src/render/jobs/updateskinningpalettejob_p.h @@ -75,7 +75,6 @@ public: protected: void run() override; - void findDirtyArmatures(Entity *entity, QVector<HArmature> &armatures) const; NodeManagers *m_nodeManagers; Entity *m_root; QVector<HJoint> m_dirtyJoints; |