From: tomaz tomaz@d7cf8633-e32d-0410-b094-e92efae38249 <>
Date: Sat, 11 Sep 2010 09:54:18 +0000 (+0000)
Subject: UNMERGE
X-Git-Tag: xonotic-v0.1.0preview~205
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0e2778e9b1a55674b5ff4a964e006e5ee634ff3b;p=xonotic%2Fdarkplaces.git

UNMERGE
Ignored MSVC build directories
Silenced a warning in MSVC 2008

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10456 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=3c548bdcd17c203e381914e2bad9240646b52e85
---

diff --git a/model_brush.c b/model_brush.c
index d9de089a..e84a7ff9 100644
--- a/model_brush.c
+++ b/model_brush.c
@@ -4713,7 +4713,7 @@ static void Mod_Q3BSP_LoadLightmaps(lump_t *l, lump_t *faceslump)
 	// figure out what the most reasonable merge power is within limits
 
 	// find the appropriate NxN dimensions to merge to, to avoid wasted space
-	realcount = count >> (int)loadmodel->brushq3.deluxemapping;
+	realcount = count >> loadmodel->brushq3.deluxemapping;
 
 	// figure out how big the merged texture has to be
 	mergegoal = 128<<bound(0, mod_q3bsp_lightmapmergepower.integer, 6);
@@ -4761,7 +4761,7 @@ static void Mod_Q3BSP_LoadLightmaps(lump_t *l, lump_t *faceslump)
 	for (i = 0;i < count;i++)
 	{
 		// figure out which merged lightmap texture this fits into
-		realindex = i >> (int)loadmodel->brushq3.deluxemapping;
+		realindex = i >> loadmodel->brushq3.deluxemapping;
 		lightmapindex = i >> powerdxy;
 
 		// choose the destination address