From 22e3e10ca41e179aeef06f22aca46905e31148f2 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sun, 30 Oct 2022 18:00:27 +0000 Subject: Setting texture unit when binding UI components --- ui/icon.cpp | 1 + ui/text.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/ui/icon.cpp b/ui/icon.cpp index 657e953..1caba68 100644 --- a/ui/icon.cpp +++ b/ui/icon.cpp @@ -25,5 +25,6 @@ Icon::Icon(const Image & tex) : size {tex.width, tex.height} void Icon::Bind() const { + glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, m_texture); } diff --git a/ui/text.cpp b/ui/text.cpp index 0c372a1..872e3f3 100644 --- a/ui/text.cpp +++ b/ui/text.cpp @@ -44,6 +44,7 @@ void Text::render(const UIShader & shader, const Position &) const { shader.useText(colour); + glActiveTexture(GL_TEXTURE0); for (const auto & m : models) { glBindTexture(GL_TEXTURE_2D, m.texture); glBindVertexArray(m.vao); -- cgit v1.2.3