From 61237f3f9f4259c7a2135bced343d1b7a9945488 Mon Sep 17 00:00:00 2001 From: havoc Date: Fri, 6 Nov 2009 15:05:39 +0000 Subject: [PATCH] fix a couple merging bugs git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9441 d7cf8633-e32d-0410-b094-e92efae38249 --- cl_particles.c | 2 -- r_lightning.c | 1 - 2 files changed, 3 deletions(-) diff --git a/cl_particles.c b/cl_particles.c index 89ac7807..593721fb 100644 --- a/cl_particles.c +++ b/cl_particles.c @@ -2134,7 +2134,6 @@ void R_DrawDecal_TransparentCallback(const entity_render_t *ent, const rtlight_t float particle_vertex3f[BATCHSIZE*12], particle_texcoord2f[BATCHSIZE*8], particle_color4f[BATCHSIZE*16]; RSurf_ActiveWorldEntity(); - rsurface.fograngerecip = r_refdef.fograngerecip; r_refdef.stats.decals += numsurfaces; R_Mesh_ResetTextureState(); @@ -2287,7 +2286,6 @@ void R_DrawParticle_TransparentCallback(const entity_render_t *ent, const rtligh float particle_vertex3f[BATCHSIZE*12], particle_texcoord2f[BATCHSIZE*8], particle_color4f[BATCHSIZE*16]; RSurf_ActiveWorldEntity(); - rsurface.fograngerecip = r_refdef.fograngerecip; Vector4Set(colormultiplier, r_refdef.view.colorscale * (1.0 / 256.0f), r_refdef.view.colorscale * (1.0 / 256.0f), r_refdef.view.colorscale * (1.0 / 256.0f), cl_particles_alpha.value * (1.0 / 256.0f)); diff --git a/r_lightning.c b/r_lightning.c index 03208b8c..7455ad92 100644 --- a/r_lightning.c +++ b/r_lightning.c @@ -224,7 +224,6 @@ void R_DrawLightningBeam_TransparentCallback(const entity_render_t *ent, const r float texcoord2f[12*2]; RSurf_ActiveCustomEntity(&identitymatrix, &identitymatrix, 0, 0, r_lightningbeam_color_red.value * r_refdef.view.colorscale, r_lightningbeam_color_green.value * r_refdef.view.colorscale, r_lightningbeam_color_blue.value * r_refdef.view.colorscale, 1, 12, vertex3f, texcoord2f, NULL, NULL, NULL, 6, r_lightningbeamelement3i, r_lightningbeamelement3s, false, false); - rsurface.fograngerecip = r_refdef.fograngerecip; if (r_lightningbeam_qmbtexture.integer && r_lightningbeamqmbtexture == NULL) r_lightningbeams_setupqmbtexture(); -- 2.39.2