diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-08-31 03:09:07 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-08-31 03:09:07 +0400 |
| commit | 95d92095e1f4e462d8bef38a7741f9fc71a9af98 (patch) | |
| tree | aaa9c13eb701db725444c22ea3260ba1140d83a3 /source/blender/freestyle/intern/stroke/Curve.cpp | |
| parent | edde9f2666b6b2ccaf0e65fd6d6963a31ae00e9e (diff) | |
Fix for an error condition in CurvePoint::getFEdge() within the C++ layer.
The error was identified thanks to a problem report that MaterialF0D() failed
when the Face Smoothness option was enabled.
Diffstat (limited to 'source/blender/freestyle/intern/stroke/Curve.cpp')
| -rwxr-xr-x | source/blender/freestyle/intern/stroke/Curve.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/freestyle/intern/stroke/Curve.cpp b/source/blender/freestyle/intern/stroke/Curve.cpp index d865d9be8e4..4cca210161e 100755 --- a/source/blender/freestyle/intern/stroke/Curve.cpp +++ b/source/blender/freestyle/intern/stroke/Curve.cpp @@ -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)); |