From 17bd80329a0656c64ab9aba81df14bdec59d976b Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 21 Jun 2016 17:03:33 +0100 Subject: [PATCH] Fixed line endings --- src/osg/glu/libtess/mesh.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/osg/glu/libtess/mesh.cpp b/src/osg/glu/libtess/mesh.cpp index 4ad7a4950..6920c1651 100644 --- a/src/osg/glu/libtess/mesh.cpp +++ b/src/osg/glu/libtess/mesh.cpp @@ -131,7 +131,7 @@ static void Splice( GLUhalfEdge *a, GLUhalfEdge *b ) * the new vertex *before* vNext so that algorithms which walk the vertex * list will not see the newly created vertices. */ -static void MakeVertex( GLUvertex *newVertex, +static void MakeVertex( GLUvertex *newVertex, GLUhalfEdge *eOrig, GLUvertex *vNext ) { GLUhalfEdge *e; @@ -171,7 +171,7 @@ static void MakeFace( GLUface *newFace, GLUhalfEdge *eOrig, GLUface *fNext ) GLUface *fPrev; GLUface *fNew = newFace; - assert(fNew != NULL); + assert(fNew != NULL); /* insert in circular doubly-linked list before fNext */ fPrev = fNext->prev; @@ -283,9 +283,9 @@ GLUhalfEdge *__gl_meshMakeEdge( GLUmesh *mesh ) if (newVertex1 == NULL || newVertex2 == NULL || newFace == NULL) { if (newVertex1 != NULL) memFree(newVertex1); if (newVertex2 != NULL) memFree(newVertex2); - if (newFace != NULL) memFree(newFace); + if (newFace != NULL) memFree(newFace); return NULL; - } + } e = MakeEdge( &mesh->eHead ); if (e == NULL) { @@ -300,7 +300,7 @@ GLUhalfEdge *__gl_meshMakeEdge( GLUmesh *mesh ) MakeFace( newFace, e, &mesh->fHead ); return e; } - + /* __gl_meshSplice( eOrg, eDst ) is the basic operation for changing the * mesh connectivity and topology. It changes the mesh so that @@ -357,7 +357,7 @@ int __gl_meshSplice( GLUhalfEdge *eOrg, GLUhalfEdge *eDst ) eOrg->Org->anEdge = eOrg; } if( ! joiningLoops ) { - GLUface *newFace= allocFace(); + GLUface *newFace= allocFace(); if (newFace == NULL) return 0; /* We split one loop into two -- the new loop is eDst->Lface. @@ -405,7 +405,7 @@ int __gl_meshDelete( GLUhalfEdge *eDel ) Splice( eDel, eDel->Oprev ); if( ! joiningLoops ) { GLUface *newFace= allocFace(); - if (newFace == NULL) return 0; + if (newFace == NULL) return 0; /* We are splitting one loop into two -- create a new loop for eDel. */ MakeFace( newFace, eDel, eDel->Lface ); @@ -508,7 +508,7 @@ GLUhalfEdge *__gl_meshSplitEdge( GLUhalfEdge *eOrg ) GLUhalfEdge *__gl_meshConnect( GLUhalfEdge *eOrg, GLUhalfEdge *eDst ) { GLUhalfEdge *eNewSym; - int joiningLoops = FALSE; + int joiningLoops = FALSE; GLUhalfEdge *eNew = MakeEdge( eOrg ); if (eNew == NULL) return NULL; @@ -610,7 +610,7 @@ GLUmesh *__gl_meshNewMesh( void ) if (mesh == NULL) { return NULL; } - + v = &mesh->vHead; f = &mesh->fHead; e = &mesh->eHead;