From: Rudolf Polzer <divVerent@xonotic.org>
Date: Thu, 13 Jan 2011 20:18:04 +0000 (+0100)
Subject: fix another misapplied diff
X-Git-Tag: xonotic-v0.5.0~64
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cfbdf38d39905bc26ca28673f3e9949a433b01a9;p=xonotic%2Fnetradiant.git

fix another misapplied diff
---

diff --git a/tools/quake3/q3map2/brush.c b/tools/quake3/q3map2/brush.c
index fd31f590..b7c50f4c 100644
--- a/tools/quake3/q3map2/brush.c
+++ b/tools/quake3/q3map2/brush.c
@@ -321,52 +321,6 @@ void SnapWeldVectorAccu(vec3_accu_t a, vec3_accu_t b, vec3_accu_t out)
 	}
 }
 
-/*
-==================
-SnapWeldVectorAccu
-
-Welds two vectors into a third, taking into account nearest-to-integer
-instead of averaging.
-==================
-*/
-void SnapWeldVectorAccu(vec3_accu_t a, vec3_accu_t b, vec3_accu_t out)
-{
-	// I'm just preserving what I think was the intended logic of the original
-	// SnapWeldVector().  I'm not actually sure where this function should even
-	// be used.  I'd like to know which kinds of problems this function addresses.
-
-	// TODO: I thought we're snapping all coordinates to nearest 1/8 unit?
-	// So what is natural about snapping to the nearest integer?  Maybe we should
-	// be snapping to the nearest 1/8 unit instead?
-
-	int		i;
-	vec_accu_t	ai, bi, ad, bd;
-	
-	if (a == NULL || b == NULL || out == NULL)
-		Error("SnapWeldVectorAccu: NULL argument");
-	
-	for (i = 0; i < 3; i++)
-	{
-		ai = Q_rintAccu(a[i]);
-		bi = Q_rintAccu(b[i]);
-		ad = fabs(ai - a[i]);
-		bd = fabs(bi - b[i]);
-	
-		if (ad < bd)
-		{
-			if (ad < SNAP_EPSILON)	out[i] = ai;
-			else			out[i] = a[i];
-		}
-		else
-		{
-			if (bd < SNAP_EPSILON)	out[i] = bi;
-			else			out[i] = b[i];
-		}
-	}
-}
-
-
-
 /*
 FixWinding() - ydnar
 removes degenerate edges from a winding