diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2015-09-18 10:58:19 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2015-10-13 12:12:30 +0000 |
| commit | 84ca9536545f182bc098ef19dbfda472c6a5ae35 (patch) | |
| tree | c025603df1cd2f696a077f10ec7cc625186aefd0 /src/render/backend/renderer.cpp | |
| parent | beb770c05f6fc037ddd49c08d706d29b935bd40d (diff) | |
Rename RenderShader -> Shader
Change-Id: Iafdfc44bdc97c53974a2d47834a61914be06ac25
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/backend/renderer.cpp')
| -rw-r--r-- | src/render/backend/renderer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp index ff00ceeaa..64249e5c8 100644 --- a/src/render/backend/renderer.cpp +++ b/src/render/backend/renderer.cpp @@ -61,7 +61,7 @@ #include <Qt3DRenderer/private/material_p.h> #include <Qt3DRenderer/private/renderpassfilternode_p.h> #include <Qt3DRenderer/private/renderqueue_p.h> -#include <Qt3DRenderer/private/rendershader_p.h> +#include <Qt3DRenderer/private/shader_p.h> #include <Qt3DRenderer/private/renderstate_p.h> #include <Qt3DRenderer/private/rendertechnique_p.h> #include <Qt3DRenderer/private/renderthread_p.h> @@ -850,7 +850,7 @@ void Renderer::executeCommands(const QVector<RenderCommand *> &commands) continue; } - RenderShader *shader = m_shaderManager->data(command->m_shader); + Shader *shader = m_shaderManager->data(command->m_shader); if (shader == Q_NULLPTR) { shader = m_defaultRenderShader; command->m_parameterAttributeToShaderNames = m_defaultParameterToGLSLAttributeNames; |