From bf9cdcb04f9d7d3d25ae4baf1d6a5742dfcff204 Mon Sep 17 00:00:00 2001 From: zicodxx Date: Tue, 8 Jan 2013 19:12:36 +0100 Subject: [PATCH] Changed additive color blending func to GL_ONE, GL_ONE - patch by derhass --- CHANGELOG.txt | 1 + arch/ogl/ogl.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index a77c8b162..9187b4e60 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -8,6 +8,7 @@ main/inferno.c: Disable fullscreen toggling via ALT+ENTER if Game_wind is on top arch/sdl/mouse.c, d2x.ini, include/args.h, main/inferno.c, misc/args.c: Added option to hide mouse cursor (without disabling the mouse completely) SConstruct: Patch by A Future Pilot to hopefully fix bug which prevented building source within MinGW if Visual Studio installed main/ai2.c: Corrected ai_fire_laser_at_player() syntax where boss should not fire when Boss_dying_start_time != 0 and boss flag is set - patch by derhass +arch/ogl/ogl.c: Changed additive color blending func to GL_ONE, GL_ONE - patch by derhass 20130103 -------- diff --git a/arch/ogl/ogl.c b/arch/ogl/ogl.c index e4e4985a8..f951b4432 100644 --- a/arch/ogl/ogl.c +++ b/arch/ogl/ogl.c @@ -1183,7 +1183,7 @@ void ogl_set_blending() glBlendFunc( GL_SRC_ALPHA, GL_ONE ); break; case GR_BLEND_ADDITIVE_C: - glBlendFunc( GL_SRC_COLOR, GL_ONE ); + glBlendFunc( GL_ONE, GL_ONE ); break; case GR_BLEND_NORMAL: default: