[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690

["Alexandre Julliard" <julliard@winehq.org>]

The following commit has been merged in the wheezy branch:
commit 1096e0fd100097a883853c4202a870d06255faa1
Author: Michael Mc Donnell <michael@mcdonnell.dk>
Date:   Wed Mar 21 23:27:35 2012 +0100

    d3dx9: Do not weld self.
    (cherry picked from commit f144626e81c3b60bbc9a9c028e4a8ec1f5d96c24)

diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c
index 022e66d..84856b3 100644
--- a/dlls/d3dx9_36/mesh.c
+++ b/dlls/d3dx9_36/mesh.c
@@ -6640,6 +6640,13 @@ HRESULT WINAPI D3DXWeldVertices(LPD3DXMESH mesh,
                 BYTE *from = &vertices[vertex_size*point_reps[index] + decl_ptr->Offset];
                 FLOAT epsilon = get_component_epsilon(decl_ptr, epsilons);
 
+                /* Don't weld self */
+                if (index == point_reps[index])
+                {
+                    matches++;
+                    continue;
+                }
+
                 if (weld_component(to, from, decl_ptr->Type, epsilon))
                     matches++;
             }

-- 
Debian Wine packaging