Merge branch 'buffer-offset-fix' into 'master'

Strike null-pointer-arithmetic error in BUFFER_OFFSET

See merge request STJr/SRB2!989
This commit is contained in:
Digiku 2020-06-08 11:56:48 -04:00
commit 70eb5ba634

View file

@ -1924,7 +1924,7 @@ EXPORT void HWRAPI(CreateModelVBOs) (model_t *model)
}
}
#define BUFFER_OFFSET(i) ((char*)NULL + (i))
#define BUFFER_OFFSET(i) ((void*)(i))
static void DrawModelEx(model_t *model, INT32 frameIndex, INT32 duration, INT32 tics, INT32 nextFrameIndex, FTransform *pos, float scale, UINT8 flipped, UINT8 *color)
{