From 2bc57e09fc5ad356b342bb0dc466b5a761583802 Mon Sep 17 00:00:00 2001 From: havoc Date: Tue, 28 Jun 2011 08:12:15 +0000 Subject: [PATCH] fix offsetmapping without a q3 shader on Q1BSP and MDL git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11226 d7cf8633-e32d-0410-b094-e92efae38249 --- model_alias.c | 2 +- model_brush.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/model_alias.c b/model_alias.c index 3672dbc0..2231f3df 100644 --- a/model_alias.c +++ b/model_alias.c @@ -785,7 +785,7 @@ static void Mod_BuildAliasSkinFromSkinFrame(texture_t *texture, skinframe_t *ski if (texture->currentskinframe->hasalpha) texture->basematerialflags |= MATERIALFLAG_ALPHA | MATERIALFLAG_BLENDED | MATERIALFLAG_NOSHADOW; texture->currentmaterialflags = texture->basematerialflags; - texture->offsetmapping = OFFSETMAPPING_OFF; + texture->offsetmapping = OFFSETMAPPING_DEFAULT; texture->offsetscale = 1; texture->specularscalemod = 1; texture->specularpowermod = 1; diff --git a/model_brush.c b/model_brush.c index c0e53d33..6a329ccd 100644 --- a/model_brush.c +++ b/model_brush.c @@ -1659,7 +1659,7 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l) tx->reflectfactor = 1; Vector4Set(tx->reflectcolor4f, 1, 1, 1, 1); tx->r_water_wateralpha = 1; - tx->offsetmapping = OFFSETMAPPING_OFF; + tx->offsetmapping = OFFSETMAPPING_DEFAULT; tx->offsetscale = 1; tx->specularscalemod = 1; tx->specularpowermod = 1; @@ -1788,6 +1788,8 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l) skinframe = R_SkinFrame_LoadExternal(gamemode == GAME_TENEBRAE ? tx->name : va("textures/%s/%s", mapname, tx->name), TEXF_ALPHA | TEXF_MIPMAP | TEXF_ISWORLD | TEXF_PICMIP | TEXF_COMPRESS, false); if (!skinframe) skinframe = R_SkinFrame_LoadExternal(gamemode == GAME_TENEBRAE ? tx->name : va("textures/%s", tx->name), TEXF_ALPHA | TEXF_MIPMAP | TEXF_ISWORLD | TEXF_PICMIP | TEXF_COMPRESS, false); + if (skinframe) + tx->offsetmapping = OFFSETMAPPING_DEFAULT; // allow offsetmapping on external textures without a q3 shader if (!skinframe) { // did not find external texture, load it from the bsp or wad3 -- 2.39.2