d3dx9: Do not weld self.

f144626e · Michael Mc Donnell · Alexandre Julliard · 9f0119a0 · f144626e
Commit f144626e authored Mar 21, 2012 by Michael Mc Donnell Committed by Alexandre Julliard Mar 28, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

mesh.c dlls/d3dx9_36/mesh.c +7 -0

No files found.
--- 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++;
            }