Michael Mc Donnell : d3dx9: Do not weld self.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f144626e81c3b60bbc9a9c028e4a8ec1f5d96c24
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f144626e81c3b60bbc9a9c028e...

Author: Michael Mc Donnell 
Date:   Wed Mar 21 23:27:35 2012 +0100

d3dx9: Do not weld self.

---

dlls/d3dx9_36/mesh.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

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++;
             }