Merge branch 'dynlightmodels'

This commit is contained in:
Magnus Norddahl 2017-08-15 00:27:26 +02:00
commit c3562fead2
11 changed files with 163 additions and 9 deletions

View file

@ -328,7 +328,10 @@ void GLSprite::Draw(int pass)
{
if (gl_lights && GLRenderer->mLightCount && mDrawer->FixedColormap == CM_DEFAULT && !fullbright)
{
gl_SetDynSpriteLight(gl_light_sprites ? actor : NULL, gl_light_particles ? particle : NULL);
if (modelframe && !particle)
gl_SetDynModelLight(gl_light_sprites ? actor : NULL, false);
else
gl_SetDynSpriteLight(gl_light_sprites ? actor : NULL, gl_light_particles ? particle : NULL);
}
sector_t *cursec = actor ? actor->Sector : particle ? particle->subsector->sector : nullptr;
if (cursec != nullptr)