diff options
| author | JosJuice <josjuice@gmail.com> | 2025-03-15 17:53:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-15 17:53:11 +0100 |
| commit | 049e52ce1cd3f075f6992d591bdf2ce5ecbdea0f (patch) | |
| tree | dafa376238b308d5bc33b0f1bc5063d8a4910eb0 | |
| parent | e637a05707b1b146a541da6525a431d42668f5fa (diff) | |
| parent | f2d19187146e535bda0f7e0220771c6a039130a0 (diff) | |
Merge pull request #13429 from JosJuice/fix-broken-merge
Fix broken merge of PR #13181
| -rw-r--r-- | Source/Core/VideoCommon/OnScreenUI.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/VideoCommon/OnScreenUI.cpp b/Source/Core/VideoCommon/OnScreenUI.cpp index 868ca3c079..d1c15f7f80 100644 --- a/Source/Core/VideoCommon/OnScreenUI.cpp +++ b/Source/Core/VideoCommon/OnScreenUI.cpp @@ -252,7 +252,7 @@ void OnScreenUI::DrawImGui() static_cast<int>(cmd.ClipRect.x), static_cast<int>(cmd.ClipRect.y), static_cast<int>(cmd.ClipRect.z), static_cast<int>(cmd.ClipRect.w)), g_gfx->GetCurrentFramebuffer())); - g_gfx->SetTexture(0, static_cast<const AbstractTexture*>(cmd.TextureId)); + g_gfx->SetTexture(0, reinterpret_cast<const AbstractTexture*>(cmd.TextureId)); g_gfx->DrawIndexed(base_index, cmd.ElemCount, base_vertex); base_index += cmd.ElemCount; } |
