fix a couple merging bugs

[xonotic/darkplaces.git] / r_lightning.c

diff --git a/r_lightning.c b/r_lightning.c
index 03208b8ce780d05afb7ab500fa464d423a1acb85..7455ad92b48cd739da20b2fd4f612a46cc326640 100644 (file)
--- 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();