diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-06-16 04:14:28 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-06-16 04:14:28 +0400 |
| commit | bc9121f627b107f05ed1d373390d6a432c2ec5d9 (patch) | |
| tree | d0a468b287646f26c1a6f58ec79c7b9d47204cd3 /source/blender/freestyle/intern/view_map | |
| parent | fc4f6a7bad0030c49d61b3c71aa4ffe0e5b9fa38 (diff) | |
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!
Diffstat (limited to 'source/blender/freestyle/intern/view_map')
| -rw-r--r-- | source/blender/freestyle/intern/view_map/Silhouette.h | 3 |
1 files changed, 3 insertions, 0 deletions
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<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 @@ 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()); |