Merge branch 'master' into qzdoom-merge

This commit is contained in:
Rachael Alexanderson 2017-07-20 06:43:03 -04:00
commit d020ec68d2

View file

@ -114,7 +114,7 @@ CUSTOM_CVAR(Int, gl_ssao, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
self = 0; self = 0;
} }
CUSTOM_CVAR(Int, gl_ssao_portals, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) CUSTOM_CVAR(Int, gl_ssao_portals, 1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
{ {
if (self < 0) if (self < 0)
self = 0; self = 0;