sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Graphics: Fix build 

Former-commit-id: cd9330ad49ce39306e27467fa59a680cbdd1b18f [formerly ff3f48136855717fcb83813c5da97cc98626680c] [formerly dd21940dc6c23459b3c7ba44d1ae1f911779e0c9 [formerly 9cb35278aacc1f07935bface1cc59f617448c2d2]]
Former-commit-id: 744562fcd5ff9501b8d7003d56cde60b52ae25ad [formerly e49b23beeb93595203783ec375f471773497d50c]
Former-commit-id: 9b3b5e63ff32a20779e2599e45a97b618cf95f93
This commit is contained in:
Lynix 2016-08-05 22:58:14 +02:00
parent a7ce82c2c9
commit 82a082341c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Nazara/Graphics/ForwardRenderTechnique.cpp
View File

@ -824,11 +824,12 @@ namespace Nz
lastPipeline = pipeline; lastPipeline = pipeline;
} }
// We begin to apply the material (and get the shader activated doing so) // We begin to apply the material
UInt8 freeTextureUnit; UInt8 freeTextureUnit;
const Shader* shader = material->Apply(*pipelineInstance, 0, &freeTextureUnit); material->Apply(*pipelineInstance, 0, &freeTextureUnit);
// Uniforms are conserved in our program, there's no point to send them back until they change // Uniforms are conserved in our program, there's no point to send them back until they change
const Shader* shader = pipelineInstance->uberInstance->GetShader();
if (shader != lastShader) if (shader != lastShader)
{ {
// Index of uniforms in the shader // Index of uniforms in the shader