From bc9121f627b107f05ed1d373390d6a432c2ec5d9 Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Sun, 16 Jun 2013 00:14:28 +0000 Subject: 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! --- source/blender/freestyle/intern/view_map/Silhouette.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source/blender/freestyle/intern/view_map') diff --git a/source/blender/freestyle/intern/view_map/Silhouette.h b/source/blender/freestyle/intern/view_map/Silhouette.h index e0bf2ff6120..02d3698c914 100644 --- a/source/blender/freestyle/intern/view_map/Silhouette.h +++ b/source/blender/freestyle/intern/view_map/Silhouette.h @@ -1668,6 +1668,7 @@ public: FEdgeSmooth *fes = dynamic_cast(ioEdge); se->setNormal(fes->normal()); se->setFrsMaterialIndex(fes->frs_materialIndex()); + se->setFaceMark(fes->faceMark()); } else { newEdge = new FEdgeSharp(ioNewVertex, B); @@ -1677,6 +1678,8 @@ public: se->setNormalB(fes->normalB()); se->setaFrsMaterialIndex(fes->aFrsMaterialIndex()); se->setbFrsMaterialIndex(fes->bFrsMaterialIndex()); + se->setaFaceMark(fes->aFaceMark()); + se->setbFaceMark(fes->bFaceMark()); } newEdge->setNature(ioEdge->getNature()); -- cgit v1.2.3