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

Graphics: Fix build 

Former-commit-id: f90f824361033d6accd56e6f11262c7f7bbc72d0 [formerly 7578444e26141f23e5f501d2f0deb1e60fc9e0fa] [formerly 94496fe3569ab91a47b46b9c5190f8e713df1bcd [formerly b5229f1ec2d406c8c6dee27b49664ce06784f649]]
Former-commit-id: 1b1a32242c7b6db509cf0a042974ccd8f60e6b46 [formerly 4bc3be4a64b03d166c685164a80ca332dc52ae56]
Former-commit-id: 1089d9778bd3060c453eb1b64c0c1259bb290ca8
This commit is contained in:
Lynix 2016-08-05 22:58:14 +02:00
parent 87b5047b14
commit 465801836d
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;
}
// We begin to apply the material (and get the shader activated doing so)
// We begin to apply the material
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
const Shader* shader = pipelineInstance->uberInstance->GetShader();
if (shader != lastShader)
{
// Index of uniforms in the shader