diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-19 21:55:16 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-19 21:55:23 +0200 |
| commit | d51dad630e0afb6ddca19ee61dd1ddf424fb49c2 (patch) | |
| tree | 1ca0630bfb8af983950621399dbd4d0863afa568 /src/render/materialsystem/parameter_p.h | |
| parent | c8dab9f129ba838988e2c0ae67071a0197e75045 (diff) | |
| parent | 471ea347fde07cf5e48c586c47bf066220dc78c2 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src/render/materialsystem/parameter_p.h')
| -rw-r--r-- | src/render/materialsystem/parameter_p.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/render/materialsystem/parameter_p.h b/src/render/materialsystem/parameter_p.h index 4ab04bc8e..9deaa11f3 100644 --- a/src/render/materialsystem/parameter_p.h +++ b/src/render/materialsystem/parameter_p.h @@ -71,16 +71,15 @@ public: void cleanup(); - void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override; + void syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime) override; QString name() const; int nameId() const Q_DECL_NOTHROW { return m_nameId; } const UniformValue &uniformValue() const { return m_uniformValue; } private: - void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final; - QString m_name; + QVariant m_backendValue; UniformValue m_uniformValue; int m_nameId; }; |