diff options
| author | Janne Kangas <janne.kangas@qt.io> | 2019-07-26 14:49:10 +0300 |
|---|---|---|
| committer | Janne Kangas <janne.kangas@qt.io> | 2019-10-02 14:09:06 +0300 |
| commit | 3af0e80dbd23ff6ad4d18093ab7aa065b16727ac (patch) | |
| tree | 53e818f6eb56793cac6e35db29ea1535059fd3a7 /src/runtimerender/Qt3DSRenderCustomMaterialRenderContext.h | |
| parent | 3c53d50068768bc574b80ecb865eeb9aeb1c2356 (diff) | |
Indicate material shader errors in Editor
Task-id: QT3DS-3964
Change-Id: Ifac1df41862821c7220c3e9c88d34ceceaacbb0f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Diffstat (limited to 'src/runtimerender/Qt3DSRenderCustomMaterialRenderContext.h')
| -rw-r--r-- | src/runtimerender/Qt3DSRenderCustomMaterialRenderContext.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/runtimerender/Qt3DSRenderCustomMaterialRenderContext.h b/src/runtimerender/Qt3DSRenderCustomMaterialRenderContext.h index 5283660..06267d2 100644 --- a/src/runtimerender/Qt3DSRenderCustomMaterialRenderContext.h +++ b/src/runtimerender/Qt3DSRenderCustomMaterialRenderContext.h @@ -56,7 +56,7 @@ namespace render { const QT3DSMat44 &m_ModelViewProjection; const QT3DSMat44 &m_ModelMatrix; ///< model to world transformation const QT3DSMat33 &m_NormalMatrix; - const SCustomMaterial &m_Material; + SCustomMaterial &m_Material; const NVRenderTexture2D *m_DepthTexture; const NVRenderTexture2D *m_AOTexture; SShaderDefaultMaterialKey m_MaterialKey; @@ -66,7 +66,7 @@ namespace render { SCustomMaterialRenderContext( const SLayer &layer, const SLayerRenderData &data, NVDataRef<SLight *> lights, const SCamera &cam, const SModel &m, const SRenderSubset &subset, const QT3DSMat44 &mvp, - const QT3DSMat44 &world, const QT3DSMat33 &nm, const SCustomMaterial &material, + const QT3DSMat44 &world, const QT3DSMat33 &nm, SCustomMaterial &material, const NVRenderTexture2D *depthTex, const NVRenderTexture2D *aoTex, SShaderDefaultMaterialKey inMaterialKey, SRenderableImage *inFirstImage = NULL, QT3DSF32 opacity = 1.0) |