[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39811] branches/soc-2008-mxcurioni/source /blender/freestyle/intern/stroke/Curve.cpp: Fix for an error condition in CurvePoint::getFEdge() within the C++ layer.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Wed Aug 31 01:09:07 CEST 2011
Revision: 39811
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39811
Author: kjym3
Date: 2011-08-30 23:09:07 +0000 (Tue, 30 Aug 2011)
Log Message:
-----------
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.
Modified Paths:
--------------
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/Curve.cpp
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/Curve.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/Curve.cpp 2011-08-30 23:08:38 UTC (rev 39810)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/Curve.cpp 2011-08-30 23:09:07 UTC (rev 39811)
@@ -203,7 +203,7 @@
||
((__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 @@
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));
More information about the Bf-blender-cvs
mailing list