Skip to content

Commit d40cf7a

Browse files
authored
Merge pull request #1179 from asarium/fix/651
Make sure that team glow colors don't go negativ
2 parents fa90542 + 1cf0bac commit d40cf7a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

code/def_files/main-f.sdr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,8 +364,8 @@ void main()
364364
#ifdef FLAG_TEAMCOLOR
365365
vec4 teamMask = vec4(0.0, 0.0, 0.0, 0.0);
366366
teamMask = texture(sMiscmap, texCoord);
367-
vec3 base = base_color - vec3(0.5);
368-
vec3 stripe = stripe_color - vec3(0.5);
367+
vec3 base = max(base_color - vec3(0.5), vec3(0.0));
368+
vec3 stripe = max(stripe_color - vec3(0.5), vec3(0.0));
369369
baseColor.rgb += (base * teamMask.x) + (stripe * teamMask.y);
370370
baseColor.rgb = max(baseColor.rgb, vec3(0.0));
371371
#endif

0 commit comments

Comments
 (0)