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

Fix for an error condition in CurvePoint::getFEdge() within the C++ layer.

Browse Source 
The error was identified thanks to a problem report that MaterialF0D() failed
when the Face Smoothness option was enabled.
This commit is contained in:
Tamito Kajiyama
2011-08-30 23:09:07 +00:00
parent edde9f2666
commit 95d92095e1
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/freestyle/intern/stroke/Curve.cpp
View File

@@ -203,7 +203,7 @@ FEdge* CurvePoint::getFEdge(Interface0D& inter)
||
((__A == iVertexB->__B) && (__B == iVertexB->__A)))
return __A->getFEdge(*__B);
else if(__B == 0)
if(__B == 0)
{
if(iVertexB->__B == 0)
return __A->getFEdge(*(iVertexB->__A));
@@ -212,35 +212,35 @@ FEdge* CurvePoint::getFEdge(Interface0D& inter)
else if(iVertexB->__B == __A)
return __A->getFEdge(*(iVertexB->__A));
}
else if(iVertexB->__B == 0)
if(iVertexB->__B == 0)
{
if(iVertexB->__A == __A)
return __B->getFEdge(*(iVertexB->__A));
else if(iVertexB->__A == __B)
return __A->getFEdge(*(iVertexB->__A));
}
else if(__B == iVertexB->__A)
if(__B == iVertexB->__A)
{
if((_t2d != 1) && (iVertexB->_t2d == 0))
return __A->getFEdge(*__B);
if((_t2d == 1) && (iVertexB->_t2d != 0))
return iVertexB->__A->getFEdge(*(iVertexB->__B));
}
else if(__B == iVertexB->__B)
if(__B == iVertexB->__B)
{
if((_t2d != 1) && (iVertexB->_t2d == 1))
return __A->getFEdge(*__B);
if((_t2d == 1) && (iVertexB->_t2d != 1))
return iVertexB->__A->getFEdge(*(iVertexB->__B));
}
else if(__A == iVertexB->__A)
if(__A == iVertexB->__A)
{
if((_t2d == 0) && (iVertexB->_t2d != 0))
return iVertexB->__A->getFEdge(*(iVertexB->__B));
if((_t2d != 0) && (iVertexB->_t2d == 0))
return __A->getFEdge(*__B);
}
else if(__A == iVertexB->__B)
if(__A == iVertexB->__B)
{
if((_t2d == 0) && (iVertexB->_t2d != 1))
return iVertexB->__A->getFEdge(*(iVertexB->__B));