diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /src/3rdparty/patches/0001-Fix-ambiguous-if-else-in-assimp.patch | |
parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'src/3rdparty/patches/0001-Fix-ambiguous-if-else-in-assimp.patch')
-rw-r--r-- | src/3rdparty/patches/0001-Fix-ambiguous-if-else-in-assimp.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/src/3rdparty/patches/0001-Fix-ambiguous-if-else-in-assimp.patch b/src/3rdparty/patches/0001-Fix-ambiguous-if-else-in-assimp.patch deleted file mode 100644 index 893336d5e..000000000 --- a/src/3rdparty/patches/0001-Fix-ambiguous-if-else-in-assimp.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 3647801a7673f1e843bd64a0ac38d60dd4ae7495 Mon Sep 17 00:00:00 2001 -From: Sean Harmer <sean.harmer@kdab.com> -Date: Sun, 13 Sep 2015 19:17:45 +0100 -Subject: [PATCH] Fix ambiguous if else in assimp - -Change-Id: I17516fc8f34dad7a99f536dc4b3cba47e7779d4b ---- - src/3rdparty/assimp/contrib/clipper/clipper.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/3rdparty/assimp/contrib/clipper/clipper.cpp b/src/3rdparty/assimp/contrib/clipper/clipper.cpp -index 2b209da..b2316cc 100644 ---- a/src/3rdparty/assimp/contrib/clipper/clipper.cpp -+++ b/src/3rdparty/assimp/contrib/clipper/clipper.cpp -@@ -2124,11 +2124,13 @@ void Clipper::AddOutPt(TEdge *e, const IntPoint &pt) - { - //check for 'rounding' artefacts ... - if (outRec->sides == esNeither && pt.Y == op->pt.Y) -+ { - if (ToFront) - { - if (pt.X == op->pt.X +1) return; //ie wrong side of bottomPt - } - else if (pt.X == op->pt.X -1) return; //ie wrong side of bottomPt -+ } - - outRec->sides = (EdgeSide)(outRec->sides | e->side); - if (outRec->sides == esBoth) --- -2.5.1 - |