jackcartersmith/obj
1
0
Fork 0
Code Issues 1 Releases Activity

Fix missing texture using previously-used texture

Browse Source
This commit is contained in:
Robert Kooima 2014-09-27 15:00:24 -05:00
parent fcfda28067
commit 6ba280ab01
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
obj.c
View File

@ -2165,6 +2165,7 @@ static void obj_render_prop(const obj *O, int mi, int ki)
glUniformMatrix4fv(O->Mloc[ki], 1, GL_FALSE, T); glUniformMatrix4fv(O->Mloc[ki], 1, GL_FALSE, T);
} }
} }
else glBindTexture(GL_TEXTURE_2D, 0);
} }
void obj_render_mtrl(const obj *O, int mi) 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++) 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); glActiveTexture(GL_TEXTURE0 + ki);
obj_render_prop(O, mi, ki); obj_render_prop(O, mi, ki);