From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 15 Nov 2010 06:21:12 +0000 (+0100)
Subject: bobtools patch width/height fix from OSXNetRadiant. Now we seem to be mostly in sync... 
X-Git-Tag: xonotic-v0.5.0~153
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bf2ca2011e074cb236802c8767c0d38836ef2a3f;p=xonotic%2Fnetradiant.git

bobtools patch width/height fix from OSXNetRadiant. Now we seem to be mostly in sync with OSXNetRadiant rev 94.
---

diff --git a/contrib/bobtoolz/DPatch.cpp b/contrib/bobtoolz/DPatch.cpp
index 3bfc6a34..10dbb4bb 100644
--- a/contrib/bobtoolz/DPatch.cpp
+++ b/contrib/bobtoolz/DPatch.cpp
@@ -318,8 +318,8 @@ DPatch* DPatch::MergePatches(patch_merge_t merge_info, DPatch *p1, DPatch *p2)
 */	
 	DPatch* newPatch = new DPatch();
 	//switched..
-	newPatch->height	= p1->width;
-	newPatch->width		= newHeight;
+	newPatch->height	= newHeight;
+	newPatch->width		= p1->width;
 	newPatch->SetTexture(p1->texture);
 
 	for(int y = 0; y < p1->height; y++)