Fix STL to Godot type convertion of polypartition
(cherry picked from commit d16bef8b55
)
This commit is contained in:
parent
a26bed52c0
commit
cf47129f9a
1 changed files with 3 additions and 3 deletions
6
thirdparty/misc/triangulator.cpp
vendored
6
thirdparty/misc/triangulator.cpp
vendored
|
@ -1166,7 +1166,7 @@ int TriangulatorPartition::MonotonePartition(List<TriangulatorPoly> *inpolys, Li
|
||||||
newedge.p1 = v->p;
|
newedge.p1 = v->p;
|
||||||
newedge.p2 = v->p;
|
newedge.p2 = v->p;
|
||||||
edgeIter = edgeTree.lower_bound(newedge);
|
edgeIter = edgeTree.lower_bound(newedge);
|
||||||
if(edgeIter == edgeTree.front()) {
|
if(edgeIter == nullptr || edgeIter == edgeTree.front()) {
|
||||||
error = true;
|
error = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -1202,7 +1202,7 @@ int TriangulatorPartition::MonotonePartition(List<TriangulatorPoly> *inpolys, Li
|
||||||
newedge.p1 = v->p;
|
newedge.p1 = v->p;
|
||||||
newedge.p2 = v->p;
|
newedge.p2 = v->p;
|
||||||
edgeIter = edgeTree.lower_bound(newedge);
|
edgeIter = edgeTree.lower_bound(newedge);
|
||||||
if(edgeIter == edgeTree.front()) {
|
if(edgeIter == nullptr || edgeIter == edgeTree.front()) {
|
||||||
error = true;
|
error = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -1241,7 +1241,7 @@ int TriangulatorPartition::MonotonePartition(List<TriangulatorPoly> *inpolys, Li
|
||||||
newedge.p1 = v->p;
|
newedge.p1 = v->p;
|
||||||
newedge.p2 = v->p;
|
newedge.p2 = v->p;
|
||||||
edgeIter = edgeTree.lower_bound(newedge);
|
edgeIter = edgeTree.lower_bound(newedge);
|
||||||
if(edgeIter == edgeTree.front()) {
|
if(edgeIter == nullptr || edgeIter == edgeTree.front()) {
|
||||||
error = true;
|
error = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue