From 054094f5827f3b6c0c1a6316c2e624f197244ec8 Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Wed, 12 Feb 2014 16:13:06 +0900 Subject: Freestyle: Fix for chaining operators not concatenating edges with Freestyle edge marks and at material boundaries. Problem report by Postoman on the BlenderArtists.org Freestyle thread, thanks a lot! --- source/blender/freestyle/intern/stroke/ChainingIterators.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'source/blender/freestyle') diff --git a/source/blender/freestyle/intern/stroke/ChainingIterators.cpp b/source/blender/freestyle/intern/stroke/ChainingIterators.cpp index 4408f5cd796..2f193cee4b7 100644 --- a/source/blender/freestyle/intern/stroke/ChainingIterators.cpp +++ b/source/blender/freestyle/intern/stroke/ChainingIterators.cpp @@ -140,11 +140,13 @@ int ChainSilhouetteIterator::traverse(const AdjacencyIterator& ait) //soc NonTVertex *nontvertex = (NonTVertex*)nextVertex; ViewEdge *newEdge(0); // we'll try to chain the edges by keeping the same nature... - // the preseance order is : SILHOUETTE, BORDER, CREASE, SUGGESTIVE, VALLEY, RIDGE - Nature::EdgeNature natures[6] = { + // the preseance order is : SILHOUETTE, BORDER, CREASE, MATERIAL_BOUNDARY, EDGE_MARK, SUGGESTIVE, VALLEY, RIDGE + Nature::EdgeNature natures[8] = { Nature::SILHOUETTE, Nature::BORDER, Nature::CREASE, + Nature::MATERIAL_BOUNDARY, + Nature::EDGE_MARK, Nature::SUGGESTIVE_CONTOUR, Nature::VALLEY, Nature::RIDGE -- cgit v1.2.3