From 2e62d512a56b161673c21e50b282b17a5fd6b887 Mon Sep 17 00:00:00 2001
From: Louis <35883445+louist103@users.noreply.github.com>
Date: Thu, 11 Jan 2024 20:00:31 -0500
Subject: [PATCH] conflict

---
 src/graphic/Fast3D/gfx_pc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/graphic/Fast3D/gfx_pc.cpp b/src/graphic/Fast3D/gfx_pc.cpp
index 868d42c6d..4f2e201e7 100644
--- a/src/graphic/Fast3D/gfx_pc.cpp
+++ b/src/graphic/Fast3D/gfx_pc.cpp
@@ -1476,7 +1476,7 @@ static void gfx_sp_tri1(uint8_t vtx1_idx, uint8_t vtx2_idx, uint8_t vtx3_idx, bo
                 gfx_flush();
 
                 // Set the same sampler params on the blended texture. Needed for opengl.
-                if (rdp.loaded_texture[i].blended) {
+                if (g_rdp.loaded_texture[i].blended) {
                     gfx_rapi->set_sampler_parameters(SHADER_FIRST_REPLACEMENT_TEXTURE + i, linear_filter, cms, cmt);
                 }