From 6ba280ab01e8352863fad5c0749cfc3c2c6205c9 Mon Sep 17 00:00:00 2001
From: Robert Kooima <robert.kooima@gmail.com>
Date: Sat, 27 Sep 2014 15:00:24 -0500
Subject: [PATCH] Fix missing texture using previously-used texture

---
 obj.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/obj.c b/obj.c
index e54553f..0597bb8 100644
--- a/obj.c
+++ b/obj.c
@@ -2165,6 +2165,7 @@ static void obj_render_prop(const obj *O, int mi, int ki)
             glUniformMatrix4fv(O->Mloc[ki], 1, GL_FALSE, T);
         }
     }
+    else glBindTexture(GL_TEXTURE_2D, 0);
 }
 
 void obj_render_mtrl(const obj *O, int mi)
@@ -2175,7 +2176,7 @@ void obj_render_mtrl(const obj *O, int mi)
 
     for (ki = 0; ki < OBJ_PROP_COUNT; ki++)
     {
-        if (O->oloc[ki] >= 0 && obj_get_mtrl_map(O, mi, ki))
+        if (O->oloc[ki] >= 0)
         {
             glActiveTexture(GL_TEXTURE0 + ki);
             obj_render_prop(O, mi, ki);