]> git.rm.cloudns.org Git - xonotic/netradiant.git/commitdiff
bobtools patch width/height fix from OSXNetRadiant. Now we seem to be mostly in sync...
authorRudolf Polzer <divverent@alientrap.org>
Mon, 15 Nov 2010 06:21:12 +0000 (07:21 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 15 Nov 2010 06:21:12 +0000 (07:21 +0100)
contrib/bobtoolz/DPatch.cpp

index 3bfc6a34ea06d9ab965bd63ffd2a59a935529149..10dbb4bb58d73493a99031d6614a0151279bd96c 100644 (file)
@@ -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++)