From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Thu, 11 Oct 2007 14:31:44 +0000 (+0000)
Subject: make more failed skin loads Prints
X-Git-Tag: xonotic-v0.1.0preview~2851
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bc9c528f831716fb31de0660b664b2f6f70b8e00;p=xonotic%2Fdarkplaces.git

make more failed skin loads Prints


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7629 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/model_alias.c b/model_alias.c
index b891b1fa..11a1f507 100644
--- a/model_alias.c
+++ b/model_alias.c
@@ -722,7 +722,7 @@ static void Mod_BuildAliasSkinsFromSkinFiles(texture_t *skin, skinfile_t *skinfi
 						tempskinframe = R_SkinFrame_LoadExternal(skinfileitem->replacement, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP | TEXF_COMPRESS, false);
 						if (!tempskinframe)
 							if (cls.state != ca_dedicated)
-								Con_DPrintf("mesh \"%s\": failed to load skin #%i \"%s\"\n", meshname, i, skinfileitem->replacement);
+								Con_Printf("mesh \"%s\": failed to load skin #%i \"%s\"\n", meshname, i, skinfileitem->replacement);
 						Mod_BuildAliasSkinFromSkinFrame(skin, tempskinframe);
 					}
 					break;
diff --git a/model_brush.c b/model_brush.c
index 4419e792..c67e9568 100644
--- a/model_brush.c
+++ b/model_brush.c
@@ -4246,7 +4246,7 @@ static void Mod_Q3BSP_LoadTextures(lump_t *l)
 
 	c = 0;
 	for (i = 0;i < count;i++, in++, out++)
-		if (Mod_LoadTextureFromQ3Shader(out, out->name, false, true, false))
+		if (!Mod_LoadTextureFromQ3Shader(out, out->name, false, true, false))
 			c++;
 	if (c)
 		Con_DPrintf("%s: %i textures missing shaders\n", loadmodel->name, c);
diff --git a/model_shared.c b/model_shared.c
index 4bed5301..7266fe6c 100644
--- a/model_shared.c
+++ b/model_shared.c
@@ -1748,7 +1748,7 @@ nothing                GL_ZERO GL_ONE
 			texture->basematerialflags |= MATERIALFLAG_WALL;
 		texture->numskinframes = 1;
 		if (!(texture->skinframes[0] = R_SkinFrame_LoadExternal(texture->name, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE | (r_picmipworld.integer ? TEXF_PICMIP : 0) | TEXF_COMPRESS, false)))
-			if(developer.integer || loadmodel->type == mod_brushq3)
+			if(developer.integer || q3bsp) // only the Q3BSP path provides no alternative (like loading image directly, or internal texture)
 				Con_Printf("^1%s:^7 could not load texture for missing shader ^3\"%s\"\n", loadmodel->name, texture->name);
 	}
 	// init the animation variables