Merge branch 'maint'

This commit is contained in:
Braden Obrzut 2014-01-18 18:10:48 -05:00
commit efa9e0c3ee
10 changed files with 1231 additions and 1203 deletions

View file

@ -607,8 +607,7 @@ visplane_t *R_FindPlane (const secplane_t &height, FTextureID picnum, int lightl
// same visplane, then only the floor sky will be drawn.
plane.c = height.c;
plane.ic = height.ic;
isskybox = skybox != NULL && !skybox->bInSkybox &&
(skybox->bAlways || picnum == skyflatnum);
isskybox = skybox != NULL && !skybox->bInSkybox;
}
else if (skybox != NULL && skybox->bAlways && !skybox->bInSkybox)
{