Merge src/r_defs.h

This commit is contained in:
SteelT 2020-08-06 18:36:30 -04:00
parent ef8fd7b671
commit 30fd6f5db5

View file

@ -551,7 +551,6 @@ typedef struct seg_s
r_lightlist_t *rlights;
polyobj_t *polyseg;
boolean dontrenderme;
<<<<<<< HEAD
#endif
// Fake contrast calculated on level load
@ -559,9 +558,7 @@ typedef struct seg_s
#ifdef HWRENDER
INT16 hwLightOffset;
#endif
=======
boolean glseg;
>>>>>>> srb2/next
} seg_t;
//