[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57488] trunk/blender/source/blender/ freestyle/intern/view_map/Silhouette.h: Fix for Freestyle face marks incorrectly reset when feature edges are split at 2D intersections .

[Tamito Kajiyama]

Revision: 57488
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57488
Author:   kjym3
Date:     2013-06-16 00:14:28 +0000 (Sun, 16 Jun 2013)
Log Message:
-----------
Fix for Freestyle face marks incorrectly reset when feature edges are split at 2D intersections.
Problem report by an anonymous forum user with a .blend file for reproducing the bug, thanks!

Modified Paths:
--------------
    trunk/blender/source/blender/freestyle/intern/view_map/Silhouette.h

Modified: trunk/blender/source/blender/freestyle/intern/view_map/Silhouette.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/view_map/Silhouette.h	2013-06-15 23:47:09 UTC (rev 57487)
+++ trunk/blender/source/blender/freestyle/intern/view_map/Silhouette.h	2013-06-16 00:14:28 UTC (rev 57488)
@@ -1668,6 +1668,7 @@
 			FEdgeSmooth *fes = dynamic_cast<FEdgeSmooth*>(ioEdge);
 			se->setNormal(fes->normal());
 			se->setFrsMaterialIndex(fes->frs_materialIndex());
+			se->setFaceMark(fes->faceMark());
 		}
 		else {
 			newEdge = new FEdgeSharp(ioNewVertex, B);
@@ -1677,6 +1678,8 @@
 			se->setNormalB(fes->normalB());
 			se->setaFrsMaterialIndex(fes->aFrsMaterialIndex());
 			se->setbFrsMaterialIndex(fes->bFrsMaterialIndex());
+			se->setaFaceMark(fes->aFaceMark());
+			se->setbFaceMark(fes->bFaceMark());
 		}
 		newEdge->setNature(ioEdge->getNature());