summaryrefslogtreecommitdiff
path: root/thirdparty/thekla_atlas/nvmesh/param
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2018-01-03 12:36:47 +0100
committerGitHub <noreply@github.com>2018-01-03 12:36:47 +0100
commit5519481803dbcdff079a2a1dceca5047f991e2ed (patch)
tree21e351d3fb13a3dbb2dc9a05d62f60337517e4d0 /thirdparty/thekla_atlas/nvmesh/param
parent8cf9269cdb614cd6601f9154ef0d6264e86a20c0 (diff)
parentc0226d2e92fb0125921b59bb2c226623ee454bef (diff)
Merge pull request #15114 from capnm/fix-bad-lightmap-crash
Avoid thekla_unwrap crash
Diffstat (limited to 'thirdparty/thekla_atlas/nvmesh/param')
-rw-r--r--thirdparty/thekla_atlas/nvmesh/param/AtlasPacker.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/thirdparty/thekla_atlas/nvmesh/param/AtlasPacker.cpp b/thirdparty/thekla_atlas/nvmesh/param/AtlasPacker.cpp
index fd37b8c59c..11e635db17 100644
--- a/thirdparty/thekla_atlas/nvmesh/param/AtlasPacker.cpp
+++ b/thirdparty/thekla_atlas/nvmesh/param/AtlasPacker.cpp
@@ -467,7 +467,11 @@ void AtlasPacker::packCharts(int quality, float texelsPerUnit, bool blockAligned
nvDebug("origin: %f %f\n", origin.x, origin.y);
nvDebug("majorAxis: %f %f\n", majorAxis.x, majorAxis.y);
nvDebug("minorAxis: %f %f\n", minorAxis.x, minorAxis.y);
- nvDebugBreak();
+ // -- GODOT start --
+ //nvDebugBreak();
+ m_atlas->setFailed();
+ return;
+ // -- GODOT end --
}
//nvCheck(tmp.x >= 0 && tmp.y >= 0);