[iortcw] 60/497: All: Rend2: Don't wash out HDR vertex light surfaces

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 7ad9fe9a63e3fdee51b4bdc362cba76bda032ff3
Author: M4N4T4RMS at gmail.com <M4N4T4RMS at gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date:   Sun Mar 9 02:07:54 2014 +0000

    All: Rend2: Don't wash out HDR vertex light surfaces
---
 MP/code/rend2/tr_bsp.c | 2 +-
 SP/code/rend2/tr_bsp.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MP/code/rend2/tr_bsp.c b/MP/code/rend2/tr_bsp.c
index fb17c08..49dee69 100644
--- a/MP/code/rend2/tr_bsp.c
+++ b/MP/code/rend2/tr_bsp.c
@@ -148,7 +148,7 @@ static void R_ColorShiftLightingFloats(float in[4], float out[4], float scale )
 	b = in[2] * scale;
 
 	// normalize by color instead of saturating to white
-	if ( !r_hdr->integer && ( r > 1 || g > 1 || b > 1 ) ) {
+	if ( r > 1 || g > 1 || b > 1 ) {
 		float	max;
 
 		max = r > g ? r : g;
diff --git a/SP/code/rend2/tr_bsp.c b/SP/code/rend2/tr_bsp.c
index c1c0d6d..50247ba 100644
--- a/SP/code/rend2/tr_bsp.c
+++ b/SP/code/rend2/tr_bsp.c
@@ -148,7 +148,7 @@ static void R_ColorShiftLightingFloats(float in[4], float out[4], float scale )
 	b = in[2] * scale;
 
 	// normalize by color instead of saturating to white
-	if ( !r_hdr->integer && ( r > 1 || g > 1 || b > 1 ) ) {
+	if ( r > 1 || g > 1 || b > 1 ) {
 		float	max;
 
 		max = r > g ? r : g;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git