diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-03-24 13:42:02 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-03-26 07:29:37 +0000 |
| commit | 66e842dc6d052293c7ec97e0ba0cfb1d10c7590c (patch) | |
| tree | e9bb503480ef980131be74512a73fab626f62e1f /src/animation/backend/additiveclipblend_p.h | |
| parent | eec0906106c7367f155f84444703754a9e66f745 (diff) | |
Remove blend() virtual function from backend blend tree nodes
No longer needed as replaced by the more general doBlend() protected
virtual.
Change-Id: I5f11c068f8a379baa53a033e5ce8ce63ff64d5ba
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/animation/backend/additiveclipblend_p.h')
| -rw-r--r-- | src/animation/backend/additiveclipblend_p.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/animation/backend/additiveclipblend_p.h b/src/animation/backend/additiveclipblend_p.h index 9a9b4aa07..31fe806ab 100644 --- a/src/animation/backend/additiveclipblend_p.h +++ b/src/animation/backend/additiveclipblend_p.h @@ -72,7 +72,6 @@ public: void setAdditiveFactor(float additiveFactor) { m_additiveFactor = additiveFactor; } // For unit tests void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL; - float blend(float value1, float value2) const Q_DECL_FINAL; inline QVector<Qt3DCore::QNodeId> dependencyIds() const Q_DECL_OVERRIDE { |