diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-19 13:54:54 +0200 |
|---|---|---|
| committer | Kim M. Kalland <kim.kalland@nokia.com> | 2011-08-22 09:55:45 +0200 |
| commit | 8be12e2ac7937ad21ec30cb335d5733735887117 (patch) | |
| tree | 4b9d3759850f73159dbf41c199ad1fd2e8628e95 /src/declarative/items/qsgshadereffectnode.cpp | |
| parent | a8cd4aec45976062773ef88c0aa3c6fcee33a5b3 (diff) | |
Move QSGShaderEffectMaterial into the QSGShaderEffectNode. Now owned by Render Thread
Change-Id: Ib80fab95780bab8e620b4696cfde3c4777f4eb93
Reviewed-on: http://codereview.qt.nokia.com/3292
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Diffstat (limited to 'src/declarative/items/qsgshadereffectnode.cpp')
| -rw-r--r-- | src/declarative/items/qsgshadereffectnode.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/items/qsgshadereffectnode.cpp b/src/declarative/items/qsgshadereffectnode.cpp index 8bd781ce58..f86b4cba4b 100644 --- a/src/declarative/items/qsgshadereffectnode.cpp +++ b/src/declarative/items/qsgshadereffectnode.cpp @@ -306,6 +306,7 @@ void QSGShaderEffectMaterial::updateTextures() const QSGShaderEffectNode::QSGShaderEffectNode() { QSGNode::setFlag(UsePreprocess, true); + setMaterial(&m_material); } QSGShaderEffectNode::~QSGShaderEffectNode() |