diff options
| author | Adam Brown <adamwbrown@gmail.com> | 2020-12-01 15:49:39 -0800 |
|---|---|---|
| committer | Adam Brown <adamwbrown@gmail.com> | 2020-12-02 00:17:45 -0800 |
| commit | 23c754360aa7046bc554b8f1e775db8d6b70157e (patch) | |
| tree | 5625bb72c77463bd136cbe5006cc28e6601882eb /modules/xatlas_unwrap | |
| parent | ba51af7904819b3739173d24567e79ee5d3600f9 (diff) | |
xatlas: Sync with upstream 5571fc7
Fixes #44017 by changing the `normalize()` function to check for non-negative rather than non-zero via an epsilon check.
Diffstat (limited to 'modules/xatlas_unwrap')
| -rw-r--r-- | modules/xatlas_unwrap/register_types.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/xatlas_unwrap/register_types.cpp b/modules/xatlas_unwrap/register_types.cpp index 65350518c3..19b827929d 100644 --- a/modules/xatlas_unwrap/register_types.cpp +++ b/modules/xatlas_unwrap/register_types.cpp @@ -141,11 +141,11 @@ bool xatlas_mesh_lightmap_unwrap_callback(float p_texel_size, const float *p_ver xatlas::Atlas *atlas = xatlas::Create(); printf("Adding mesh..\n"); - xatlas::AddMeshError::Enum err = xatlas::AddMesh(atlas, input_mesh, 1); - ERR_FAIL_COND_V_MSG(err != xatlas::AddMeshError::Enum::Success, false, xatlas::StringForEnum(err)); + xatlas::AddMeshError err = xatlas::AddMesh(atlas, input_mesh, 1); + ERR_FAIL_COND_V_MSG(err != xatlas::AddMeshError::Success, false, xatlas::StringForEnum(err)); printf("Generate..\n"); - xatlas::Generate(atlas, chart_options, xatlas::ParameterizeOptions(), pack_options); + xatlas::Generate(atlas, chart_options, xatlas::PackOptions()); *r_size_hint_x = atlas->width; *r_size_hint_y = atlas->height; |