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/assimp/contrib/poly2tri/poly2tri/sweep/sweep_context.cc | |
| parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
| parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) | |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'src/3rdparty/assimp/contrib/poly2tri/poly2tri/sweep/sweep_context.cc')
| -rw-r--r-- | src/3rdparty/assimp/contrib/poly2tri/poly2tri/sweep/sweep_context.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/assimp/contrib/poly2tri/poly2tri/sweep/sweep_context.cc b/src/3rdparty/assimp/contrib/poly2tri/poly2tri/sweep/sweep_context.cc index c9dd5a8c4..235e1eb05 100644 --- a/src/3rdparty/assimp/contrib/poly2tri/poly2tri/sweep/sweep_context.cc +++ b/src/3rdparty/assimp/contrib/poly2tri/poly2tri/sweep/sweep_context.cc @@ -164,7 +164,7 @@ void SweepContext::RemoveFromMap(Triangle* triangle) void SweepContext::MeshClean(Triangle& triangle) { - if (&triangle != NULL && !triangle.IsInterior()) { + if (!triangle.IsInterior()) { triangle.IsInterior(true); triangles_.push_back(&triangle); for (int i = 0; i < 3; i++) { |