Skip to content
Snippets Groups Projects
Commit 5f120c29 authored by Lach's avatar Lach
Browse files

Merge branch 'ogl-blend-var-fix' into 'next' 

Fix for #422

Closes #422

See merge request !1425
parents c589fe85 746c84e0
No related branches found
No related tags found
1 merge request!1425Fix for #422
Hide whitespace changes
Inline Side-by-side
Showing
with 5 additions and 0 deletions
src/hardware/hw_md2.c
+ 5
− 0
View file @ 5f120c29
...@@ -1405,6 +1405,11 @@ boolean HWR_DrawModel(gl_vissprite_t *spr) ...@@ -1405,6 +1405,11 @@ boolean HWR_DrawModel(gl_vissprite_t *spr)
|| ((!hwrBlendPatch->mipmap->format || !hwrBlendPatch->mipmap->downloaded) && !md2->noblendfile))) || ((!hwrBlendPatch->mipmap->format || !hwrBlendPatch->mipmap->downloaded) && !md2->noblendfile)))
md2_loadBlendTexture(md2); md2_loadBlendTexture(md2);
// Load it again, because it isn't being loaded into blendgpatch after md2_loadblendtexture...
blendgpatch = md2->blendgrpatch;
if (blendgpatch)
hwrBlendPatch = ((GLPatch_t *)blendgpatch->hardware);
if (md2->error) if (md2->error)
return false; // we already failed loading this before :( return false; // we already failed loading this before :(
if (!md2->model) if (!md2->model)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment