From 19612e1b13844227003ad25a83e98854926b2cac Mon Sep 17 00:00:00 2001 From: Ian Curtis Date: Thu, 13 Jun 2024 13:43:42 +0100 Subject: [PATCH] fix merge error --- Src/Graphics/New3D/R3DShaderCommon.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/Graphics/New3D/R3DShaderCommon.h b/Src/Graphics/New3D/R3DShaderCommon.h index ce79748..44cddc7 100644 --- a/Src/Graphics/New3D/R3DShaderCommon.h +++ b/Src/Graphics/New3D/R3DShaderCommon.h @@ -233,7 +233,7 @@ vec4 textureR3D(usampler2D texSampler, ivec2 wrapMode, ivec2 texSize, ivec2 texP else { // if fLevel is 0, no need to mix with next mipmap level; slight performance boost - return texBiLinear(texSampler, wrapMode, vec2(texSize0), texPos0, texCoord); + return texBiLinear(texSampler, wrapMode, vec2(texSize0), texPos0, texCoord, iLevel); } }