From 95d92095e1f4e462d8bef38a7741f9fc71a9af98 Mon Sep 17 00:00:00 2001
From: Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Date: Tue, 30 Aug 2011 23:09:07 +0000
Subject: 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.

---
 source/blender/freestyle/intern/stroke/Curve.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'source/blender/freestyle/intern/stroke/Curve.cpp')

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));
-- 
cgit v1.2.3