mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Merge src/r_defs.h
This commit is contained in:
parent
ef8fd7b671
commit
30fd6f5db5
1 changed files with 0 additions and 3 deletions
|
|
@ -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;
|
||||
|
||||
//
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue