diff options
Diffstat (limited to 'source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp')
-rw-r--r-- | source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp index de30ee0460a..cbb5c730b2b 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp +++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp @@ -2299,8 +2299,8 @@ struct less_SVertex2D { } }; -typedef Segment<FEdge *, Vec3r> segment; -typedef Intersection<segment> intersection; +using segment = Segment<FEdge *, Vec3r>; +using intersection = Intersection<segment>; struct less_Intersection { segment *edge; @@ -2326,7 +2326,7 @@ struct silhouette_binary_rule : public binary_rule<segment, segment> { { } - virtual bool operator()(segment &s1, segment &s2) + bool operator()(segment &s1, segment &s2) override { FEdge *f1 = s1.edge(); FEdge *f2 = s2.edge(); |