Commit f144626e authored by Michael Mc Donnell's avatar Michael Mc Donnell Committed by Alexandre Julliard

d3dx9: Do not weld self.

parent 9f0119a0
...@@ -6640,6 +6640,13 @@ HRESULT WINAPI D3DXWeldVertices(LPD3DXMESH mesh, ...@@ -6640,6 +6640,13 @@ HRESULT WINAPI D3DXWeldVertices(LPD3DXMESH mesh,
BYTE *from = &vertices[vertex_size*point_reps[index] + decl_ptr->Offset]; BYTE *from = &vertices[vertex_size*point_reps[index] + decl_ptr->Offset];
FLOAT epsilon = get_component_epsilon(decl_ptr, epsilons); 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)) if (weld_component(to, from, decl_ptr->Type, epsilon))
matches++; matches++;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment