diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-02-23 09:27:58 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-02-24 20:41:48 +0000 |
| commit | 87cf108f5da481d9a4eeb5d0fbb7145ecef4863e (patch) | |
| tree | 2bfe2276aec2cf02839c938cc90616a577c29207 /src/animation/backend/additiveclipblend_p.h | |
| parent | 3624ddb7beeff87196cf1ccc6684dd05457945e1 (diff) | |
Rename blendFactor on QAdditiveClipBlend to additiveFactor
Likewise for the backend node.
Task-number: QTBUG-58903
Change-Id: I2a2d084f80cf5b36a2ba6c1c03f511a1f74a2f62
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
Diffstat (limited to 'src/animation/backend/additiveclipblend_p.h')
| -rw-r--r-- | src/animation/backend/additiveclipblend_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/animation/backend/additiveclipblend_p.h b/src/animation/backend/additiveclipblend_p.h index 8664eb549..036992f06 100644 --- a/src/animation/backend/additiveclipblend_p.h +++ b/src/animation/backend/additiveclipblend_p.h @@ -62,8 +62,8 @@ public: AdditiveClipBlend(); ~AdditiveClipBlend(); - inline float blendFactor() const { return m_blendFactor; } - void setBlendFactor(float blendFactor) { m_blendFactor = blendFactor; } // For unit tests + inline float additiveFactor() const { return m_additiveFactor; } + 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; @@ -71,7 +71,7 @@ public: private: void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL; - float m_blendFactor; + float m_additiveFactor; }; } // Animation |