diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2016-01-16 19:14:04 +0000 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-01-17 17:19:19 +0000 |
commit | 47decd5d71a98d11cc5ff71f5a5e4648998d1d6b (patch) | |
tree | 7469a649f9ce1713c8a3cf9820d7e85dd881fa78 /src/render/defaults/qphongmaterial_p.h | |
parent | b0404a42ced2ea5a583e1c6ddc22940ffdc1e48e (diff) |
Add annotation to QPhongMaterial
Allows technique selector in QForwardRenderer to select from the
available techniques rather than excluding them all.
Change-Id: Ia044f3ccdf15e012b52d519fad5f0415592046fe
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/defaults/qphongmaterial_p.h')
-rw-r--r-- | src/render/defaults/qphongmaterial_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/render/defaults/qphongmaterial_p.h b/src/render/defaults/qphongmaterial_p.h index 91892af64..c3698fbcd 100644 --- a/src/render/defaults/qphongmaterial_p.h +++ b/src/render/defaults/qphongmaterial_p.h @@ -54,6 +54,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { +class QAnnotation; class QEffect; class QTechnique; class QParameter; @@ -88,6 +89,7 @@ public: QRenderPass *m_phongES2RenderPass; QShaderProgram *m_phongGL3Shader; QShaderProgram *m_phongGL2ES2Shader; + QAnnotation *m_annotation; Q_DECLARE_PUBLIC(QPhongMaterial) }; |