Merge commit '0261afc6df181092b7d57751fec84e21d3ac593c' into garux-merge

[xonotic/netradiant.git] / tools / quake3 / q3map2 / shaders.c

diff --git a/tools/quake3/q3map2/shaders.c b/tools/quake3/q3map2/shaders.c
index 5a015f42f631758bfcf4b257807cf31b6cdb06ae..70d28460ac4406a70a33916cbac162ffddc77eae 100644 (file)
--- a/tools/quake3/q3map2/shaders.c
+++ b/tools/quake3/q3map2/shaders.c
@@ -645,8 +645,8 @@ static shaderInfo_t *AllocShaderInfo( void ){
        /* set defaults */
        ApplySurfaceParm( "default", &si->contentFlags, &si->surfaceFlags, &si->compileFlags );
 
-       si->backsplashFraction = DEF_BACKSPLASH_FRACTION;
-       si->backsplashDistance = DEF_BACKSPLASH_DISTANCE;
+       si->backsplashFraction = DEF_BACKSPLASH_FRACTION * g_backsplashFractionScale;
+       si->backsplashDistance = g_backsplashDistance < -900.0f ? DEF_BACKSPLASH_DISTANCE : g_backsplashDistance;
 
        si->bounceScale = DEF_RADIOSITY_BOUNCE;