added TEXF_FORCENEAREST and TEXF_FORCELINEAR flags

[xonotic/darkplaces.git] / model_alias.c

diff --git a/model_alias.c b/model_alias.c
index db4ce0eb8dda3bc38091f6614bada4ee0903284b..9b0f33e9efd7529f3ca0e42c27a0a57f0b6a489e 100644 (file)
--- a/model_alias.c
+++ b/model_alias.c
@@ -215,7 +215,7 @@ void Mod_BuildAliasSkinFromSkinFrame(aliasskin_t *skin, skinframe_t *skinframe)
        }
        if (skinframe->base != NULL)
        {
-               layer->flags = ALIASLAYER_NODRAW_IF_NOTCOLORMAPPED | ALIASLAYER_DIFFUSE;
+               layer->flags = (skinframe->merged != NULL ? ALIASLAYER_NODRAW_IF_NOTCOLORMAPPED : 0) | ALIASLAYER_DIFFUSE;
                if (skinframe->glow != NULL)
                        layer->flags |= ALIASLAYER_ADD;
                layer->texture = skinframe->base;
@@ -256,7 +256,7 @@ void Mod_BuildAliasSkinFromSkinFrame(aliasskin_t *skin, skinframe_t *skinframe)
        }
        if (skinframe->base != NULL)
        {
-               layer->flags = ALIASLAYER_DRAW_PER_LIGHT | ALIASLAYER_NODRAW_IF_NOTCOLORMAPPED | ALIASLAYER_DIFFUSE;
+               layer->flags = ALIASLAYER_DRAW_PER_LIGHT | (skinframe->merged != NULL ? ALIASLAYER_NODRAW_IF_NOTCOLORMAPPED : 0) | ALIASLAYER_DIFFUSE;
                layer->texture = skinframe->base;
                layer->nmap = skinframe->nmap;
                layer++;