diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-03-11 10:56:51 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-03-11 10:56:51 +0400 |
| commit | 2d801f2bec3c4de663f33b0f0f198a12f09ef989 (patch) | |
| tree | dfe16a3ca2213bd5b6579ed3bc2ac2902b678067 /source/blender/freestyle/intern/winged_edge/WEdge.cpp | |
| parent | 4a92d82626980d6d1690113b9d27aae282fd48eb (diff) | |
Another big code clean-up patch from Bastien Montagne, thanks again!
Diffstat (limited to 'source/blender/freestyle/intern/winged_edge/WEdge.cpp')
| -rw-r--r-- | source/blender/freestyle/intern/winged_edge/WEdge.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.cpp b/source/blender/freestyle/intern/winged_edge/WEdge.cpp index 6201d23f9bf..b3ac888361b 100644 --- a/source/blender/freestyle/intern/winged_edge/WEdge.cpp +++ b/source/blender/freestyle/intern/winged_edge/WEdge.cpp @@ -314,7 +314,7 @@ WOEdge *WFace::MakeEdge(WVertex *v1, WVertex *v2) // Adds the edge to the face //AddEdge((*it1)->GetaOEdge()); AddEdge(woea); - (*it1)->setNumberOfOEdges((*it1)->GetNumberOfOEdges()+1); + (*it1)->setNumberOfOEdges((*it1)->GetNumberOfOEdges() + 1); //sets these vertices as border: v1->setBorder(true); v2->setBorder(true); @@ -330,7 +330,7 @@ WOEdge *WFace::MakeEdge(WVertex *v1, WVertex *v2) // Adds the edge to the face //AddEdge((*it1)->GetaOEdge()); AddEdge(woeb); - (*it1)->setNumberOfOEdges((*it1)->GetNumberOfOEdges()+1); + (*it1)->setNumberOfOEdges((*it1)->GetNumberOfOEdges() + 1); //sets these vertices as border: v1->setBorder(true); v2->setBorder(true); @@ -402,7 +402,7 @@ WOEdge *WFace::MakeEdge(WVertex *v1, WVertex *v2) } -bool WFace::getOppositeEdge (const WVertex *v, WOEdge *&e) +bool WFace::getOppositeEdge(const WVertex *v, WOEdge *&e) { if (_OEdgeList.size() != 3) return false; @@ -441,7 +441,7 @@ real WFace::getArea () } -WOEdge *WFace::GetPrevOEdge(WOEdge* iOEdge) +WOEdge *WFace::GetPrevOEdge(WOEdge *iOEdge) { vector<WOEdge *>::iterator woe, woend, woefirst; woefirst = _OEdgeList.begin(); @@ -645,7 +645,8 @@ WFace *WShape::MakeFace(vector<WVertex *>& iVertexList, vector<bool>& iFaceEdgeM if (3 == iVertexList.size()) { if ((iVertexList[0] == iVertexList[1]) || (iVertexList[0] == iVertexList[2]) || - (iVertexList[2] == iVertexList[1])) { + (iVertexList[2] == iVertexList[1])) + { cerr << "Warning: degenerated triangle detected, correcting" << endl; return NULL; } |