From ad30f5cf8da37ea342da367800c463e0718bf9a1 Mon Sep 17 00:00:00 2001 From: havoc Date: Tue, 22 Jul 2003 17:22:21 +0000 Subject: [PATCH] fix major editing mistake in Mod_LoadSkinFrame (it was using basepixels_width/height for nmappixels), thanks to Tomaz for finding this bug git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3306 d7cf8633-e32d-0410-b094-e92efae38249 --- model_shared.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model_shared.c b/model_shared.c index b9098816..758db755 100644 --- a/model_shared.c +++ b/model_shared.c @@ -775,7 +775,7 @@ int Mod_LoadSkinFrame(skinframe_t *skinframe, char *basename, int textureflags, skinframe->detail = mod_shared_detailtextures[(detailtexturecycle++) % NUM_DETAILTEXTURES]; skinframe->base = R_LoadTexture2D (loadmodel->texturepool, basename, s.basepixels_width, s.basepixels_height, s.basepixels, TEXTYPE_RGBA, textureflags, NULL); if (s.nmappixels != NULL) - skinframe->nmap = R_LoadTexture2D (loadmodel->texturepool, va("%s_nmap", basename), s.basepixels_width, s.basepixels_height, s.nmappixels, TEXTYPE_RGBA, textureflags, NULL); + skinframe->nmap = R_LoadTexture2D (loadmodel->texturepool, va("%s_nmap", basename), s.nmappixels_width, s.nmappixels_height, s.nmappixels, TEXTYPE_RGBA, textureflags, NULL); if (s.glosspixels != NULL) skinframe->gloss = R_LoadTexture2D (loadmodel->texturepool, va("%s_gloss", basename), s.glosspixels_width, s.glosspixels_height, s.glosspixels, TEXTYPE_RGBA, textureflags, NULL); if (s.glowpixels != NULL && loadglowtexture) -- 2.39.2