Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

Merge branch 'develop' into ryzomclassic-develop

Browse Source
ryzomclassic-develop
kaetemi 4 years ago
parent 59ee36332c b1ef06d900
commit c341631dbf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

4
nel/src/3d/render_trav.cpp
Unescape Escape View File

@ -921,7 +921,7 @@ void CRenderTrav::changeVPLightSetupMaterial(const CMaterial &mat, bool exclude
Driver->setUniform4f(IDriver::VertexProgram, program->idxLighted().Diffuse[i], color); Driver->setUniform4f(IDriver::VertexProgram, program->idxLighted().Diffuse[i], color);
} }
nlassert(_VPNumLights < MaxVPLight); nlassert(_VPNumLights <= MaxVPLight);
if (i != _VPNumLights) if (i != _VPNumLights)
{ {
color= _VPLightDiffuse[i] * matDiff; color= _VPLightDiffuse[i] * matDiff;
@ -1240,7 +1240,7 @@ std::string CRenderTrav::getLightVPFragmentNeLVP(uint numActivePointLights, uin
// Code frag written for 4 light max. // Code frag written for 4 light max.
nlassert(MaxVPLight==4); nlassert(MaxVPLight==4);
nlassert(numActivePointLights<=MaxVPLight-1); nlassert(numActivePointLights<=MaxVPLight);
// Add LightingVPFragmentNormalize fragment? // Add LightingVPFragmentNormalize fragment?
if(normalize) if(normalize)

Write Preview
Loading…
Cancel
Save