griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix for a failure of SVertex::getFEdge due to a discontinuity of underlying FEdges

Browse Source 
introduced by chaining operations.  When two ViewEdges are concatenated by a chaining
operator, the last vertex of one ViewEdge and the first vertex of the other reside
in the same 3D position, so that the latter vertex is omitted.  This caused a pair
of SVertices unconnected by an FEdge.  The present commit intends to fix this issue.

The bug was reported by mato_sus304 with a .blend file reproducing the issue.  Thanks!
This commit is contained in:
Tamito Kajiyama
2011-10-16 10:29:21 +00:00
parent d546002476
commit 2d25a12bbd
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/freestyle/intern/stroke/Chain.cpp
View File

@@ -49,6 +49,17 @@ void Chain::push_viewedge_back(ViewEdge *iViewEdge, bool orientation)
++v;
else
--v;
// Ensure the continuity of underlying FEdges
CurvePoint *cp = _Vertices.back();
SVertex *sv_last = cp->B();
if (!sv_last) sv_last = cp->A();
SVertex *sv_curr = (*v);
FEdge *fe = (orientation) ? iViewEdge->fedgeA() : iViewEdge->fedgeB();
FEdge *fe2 = fe->duplicate();
fe2->setVertexA(sv_last);
fe2->setVertexB(sv_curr);
sv_last->AddFEdge(fe2);
sv_curr->AddFEdge(fe2);
}
else
previous = (*v)->point2d();
@@ -99,6 +110,17 @@ void Chain::push_viewedge_front(ViewEdge *iViewEdge, bool orientation)
++v;
else
--v;
// Ensure the continuity of underlying FEdges
CurvePoint *cp = _Vertices.front();
SVertex *sv_last = cp->A();
if (!sv_last) sv_last = cp->B();
SVertex *sv_curr = (*v);
FEdge *fe = (orientation) ? iViewEdge->fedgeA() : iViewEdge->fedgeB();
FEdge *fe2 = fe->duplicate();
fe2->setVertexA(sv_curr);
fe2->setVertexB(sv_last);
sv_last->AddFEdge(fe2);
sv_curr->AddFEdge(fe2);
}
else
previous = (*v)->point2d();