diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-23 03:00:28 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-23 03:00:28 +0200 |
| commit | 566b1d88e2fa0f416b019a47989f576708578ad2 (patch) | |
| tree | e8ad2b1e28e50edfc4449dafce6dc0688aee1e15 /src/render/backend | |
| parent | 6c7f3a48c17f2f26b8672a5bc465e08d2fbba0a8 (diff) | |
| parent | be0cd9c0b19f1f1b72d2bc165e948d162b998f88 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I59141daa9207bfaadd0bdda80b1dddf14ce6e7fb
Diffstat (limited to 'src/render/backend')
| -rw-r--r-- | src/render/backend/uniform_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/backend/uniform_p.h b/src/render/backend/uniform_p.h index e31aaa609..7f273566e 100644 --- a/src/render/backend/uniform_p.h +++ b/src/render/backend/uniform_p.h @@ -181,7 +181,7 @@ public: // For nodes which will later be replaced by a Texture or Buffer UniformValue(Qt3DCore::QNodeId id) - : UniformValue() + : m_data(sizeof(Qt3DCore::QNodeId) / sizeof(float)) { m_valueType = NodeId; memcpy(m_data.data(), &id, sizeof(Qt3DCore::QNodeId)); |