diff options
| author | Hans Goudey <h.goudey@me.com> | 2020-08-12 04:59:16 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2020-08-12 04:59:16 +0300 |
| commit | ef11238c743e6985fe325280fb13e05d6ec27378 (patch) | |
| tree | 1dd2605a676bee52296535825b99f000a9c255eb /source/blender/freestyle/intern/view_map/ViewMap.cpp | |
| parent | 1f768bbe4145daed111636ca09dd53b25b8d29b5 (diff) | |
| parent | ec5f39208785c1bbe723054ffe69e1ac2ab470dd (diff) | |
Merge branch 'master' into property-search-uiproperty-search-ui
Diffstat (limited to 'source/blender/freestyle/intern/view_map/ViewMap.cpp')
| -rw-r--r-- | source/blender/freestyle/intern/view_map/ViewMap.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/source/blender/freestyle/intern/view_map/ViewMap.cpp b/source/blender/freestyle/intern/view_map/ViewMap.cpp index 47c6c3a1f6a..fa2f95dac72 100644 --- a/source/blender/freestyle/intern/view_map/ViewMap.cpp +++ b/source/blender/freestyle/intern/view_map/ViewMap.cpp @@ -323,18 +323,16 @@ static bool ViewEdgeComp(ViewVertex::directedViewEdge &dve1, ViewVertex::directe if (v2.y() < 0) { return true; } - else { - return (v1.x() > v2.x()); - } + + return (v1.x() > v2.x()); } - else { - if (v2.y() > 0) { - return false; - } - else { - return (v1.x() < v2.x()); - } + + if (v2.y() > 0) { + return false; } + + return (v1.x() < v2.x()); + return false; } |