Fix multiple bugs with ft2 font loading that were caused by the switch to cachepic...

[xonotic/darkplaces.git] / gl_rmain.c

diff --git a/gl_rmain.c b/gl_rmain.c
index 0b4a32f7b96fb94e3f737de4302c583527803f89..6fc785266ad7a84cecd634d66e42fc050ba47451 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -2151,6 +2151,8 @@ void R_SkinFrame_MarkUsed(skinframe_t *skinframe)
 
 void R_SkinFrame_PurgeSkinFrame(skinframe_t *s)
 {
+       if (s == NULL)
+               return;
        if (s->merged == s->base)
                s->merged = NULL;
        R_PurgeTexture(s->stain); s->stain = NULL;
@@ -2301,7 +2303,7 @@ skinframe_t *R_SkinFrame_LoadExternal(const char *name, int textureflags, qboole
        // return an existing skinframe if already loaded
        // if loading of the first image fails, don't make a new skinframe as it
        // would cause all future lookups of this to be missing
-       skinframe = R_SkinFrame_Find(name, textureflags, 0, 0, 0, false);
+       skinframe = R_SkinFrame_Find(name, textureflags, 0, 0, -1, false);
        if (skinframe && skinframe->base)
                return skinframe;