diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-06-20 12:50:00 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-06-20 12:50:00 +0000 |
| commit | 0148389356ca1741520f671e88266b5a7768239c (patch) | |
| tree | e22d413a3c337afff20005e19cedd3654fe2a245 /src/quick/scenegraph/qsgdefaultrendercontext.cpp | |
| parent | f2e44812a739b9f481213c67e7683b99676f2593 (diff) | |
| parent | 8af287965907e785afefaa4dd010834a76f2d0f4 (diff) | |
Merge "Merge branch 'wip/scenegraphng' into dev" into refs/staging/dev
Diffstat (limited to 'src/quick/scenegraph/qsgdefaultrendercontext.cpp')
| -rw-r--r-- | src/quick/scenegraph/qsgdefaultrendercontext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/scenegraph/qsgdefaultrendercontext.cpp b/src/quick/scenegraph/qsgdefaultrendercontext.cpp index bffffc36ad..29600ef0ca 100644 --- a/src/quick/scenegraph/qsgdefaultrendercontext.cpp +++ b/src/quick/scenegraph/qsgdefaultrendercontext.cpp @@ -259,7 +259,7 @@ void QSGDefaultRenderContext::compileShader(QSGMaterialShader *shader, QSGMateri if (vertexCode || fragmentCode) { Q_ASSERT_X((material->flags() & QSGMaterial::CustomCompileStep) == 0, "QSGRenderContext::compile()", - "materials with custom compile step cannot have custom vertex/fragment code"); + "materials with custom compile step cannot have modified vertex or fragment code"); QOpenGLShaderProgram *p = shader->program(); p->addCacheableShaderFromSourceCode(QOpenGLShader::Vertex, vertexCode ? vertexCode : shader->vertexShader()); p->addCacheableShaderFromSourceCode(QOpenGLShader::Fragment, fragmentCode ? fragmentCode : shader->fragmentShader()); |