godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix STL to Godot type convertion of polypartition 

(cherry picked from commit d16bef8b55)
This commit is contained in:
Haoyu Qiu 2021-05-21 17:12:13 +08:00 committed by Rémi Verschelde
parent 738d0b7f63
commit 20dfa4ceaa
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
thirdparty/misc/triangulator.cpp vendored
View File

@ -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;
} }