]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
Fix remnants of fog being applied to UIs
authorcloudwalk <cloudwalk@d7cf8633-e32d-0410-b094-e92efae38249>
Wed, 24 Jun 2020 14:15:20 +0000 (14:15 +0000)
committercloudwalk <cloudwalk@d7cf8633-e32d-0410-b094-e92efae38249>
Wed, 24 Jun 2020 14:15:20 +0000 (14:15 +0000)
Thanks to nico for reporting this

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12728 d7cf8633-e32d-0410-b094-e92efae38249

gl_rmain.c

index f38f7fa8f9b18a2c5511a76a95c1f618953f2ce7..b36f2466c2df10fe57636ee10a13f6ea1500885c 100644 (file)
@@ -1843,7 +1843,7 @@ void R_SetupShader_Surface(const float rtlightambient[3], const float rtlightdif
                // lightmapped wall
                if ((t->glowtexture || t->backgroundglowtexture) && r_hdr_glowintensity.value > 0 && !gl_lightmaps.integer)
                        permutation |= SHADERPERMUTATION_GLOW;
-               if (r_refdef.fogenabled)
+               if (r_refdef.fogenabled && !notrippy)
                        permutation |= r_texture_fogheighttexture ? SHADERPERMUTATION_FOGHEIGHTTEXTURE : (r_refdef.fogplaneviewabove ? SHADERPERMUTATION_FOGOUTSIDE : SHADERPERMUTATION_FOGINSIDE);
                if (t->colormapping)
                        permutation |= SHADERPERMUTATION_COLORMAPPING;