From 6db95fc37b60a4ec47599aa9e3d87ecf478bf233 Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 24 Feb 2024 16:56:28 +0100 Subject: [PATCH] fix conflict --- src/hardware/hw_batching.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hardware/hw_batching.c b/src/hardware/hw_batching.c index aa0e05375..85cd1c62e 100644 --- a/src/hardware/hw_batching.c +++ b/src/hardware/hw_batching.c @@ -115,7 +115,7 @@ void HWR_ProcessPolygon(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPt polygonArray[polygonArraySize].numVerts = iNumPts; polygonArray[polygonArraySize].polyFlags = PolyFlags; polygonArray[polygonArraySize].texture = current_texture; - polygonArray[polygonArraySize].shader = shader; + polygonArray[polygonArraySize].shader = (shader_target != -1) ? HWR_GetShaderFromTarget(shader_target) : shader_target; polygonArray[polygonArraySize].horizonSpecial = horizonSpecial; polygonArraySize++;