diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-02-21 21:32:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-21 21:32:04 +0100 |
| commit | 4e5cc1f653fa11116412c55fa194926f618404c2 (patch) | |
| tree | c65f92c4db3c01f88685b056fcd622ab4ef58da5 | |
| parent | 7e9047f37895de27ce7db55d40a2a2e7fe2fe331 (diff) | |
| parent | 36ae916c09181c252e679d6d3bae38ac7a446204 (diff) | |
Merge pull request #58376 from novaplusplus/master
Fixed issue with godot's changes to polypartition third-party code
| -rw-r--r-- | thirdparty/misc/patches/polypartition-godot-types.patch | 2 | ||||
| -rw-r--r-- | thirdparty/misc/polypartition.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/thirdparty/misc/patches/polypartition-godot-types.patch b/thirdparty/misc/patches/polypartition-godot-types.patch index 61737f9fd2..5d8aba3437 100644 --- a/thirdparty/misc/patches/polypartition-godot-types.patch +++ b/thirdparty/misc/patches/polypartition-godot-types.patch @@ -101,7 +101,7 @@ index 3a8a6efa83..8c5409bf24 100644 pointvisible = true; - for (iter2 = polys.begin(); iter2 != polys.end(); iter2++) { - if (iter2->IsHole()) { -+ for (iter2 = polys.front(); iter2; iter2->next()) { ++ for (iter2 = polys.front(); iter2; iter2 = iter2->next()) { + if (iter2->get().IsHole()) { continue; } diff --git a/thirdparty/misc/polypartition.cpp b/thirdparty/misc/polypartition.cpp index 8c5409bf24..df144c57a6 100644 --- a/thirdparty/misc/polypartition.cpp +++ b/thirdparty/misc/polypartition.cpp @@ -262,7 +262,7 @@ int TPPLPartition::RemoveHoles(TPPLPolyList *inpolys, TPPLPolyList *outpolys) { } } pointvisible = true; - for (iter2 = polys.front(); iter2; iter2->next()) { + for (iter2 = polys.front(); iter2; iter2 = iter2->next()) { if (iter2->get().IsHole()) { continue; } |