Skip to content

/ godot-scene_merge-module

forked from godot-extended-libraries/scene_merge
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update xatlas. #1

Merged
merged 1 commit into from Dec 7, 2020
+1 −2
Merged

Update xatlas. #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter
Filter file types
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.

Always

Just for now

3 merge.cpp
View file
Open in desktop
@@ -805,8 +805,7 @@ void MeshMergeMaterialRepack::_generate_atlas(const int32_t p_num_meshes, Vector
meshDecl.indexData = indexes.ptr();
meshDecl.indexFormat = xatlas::IndexFormat::UInt32;
meshDecl.faceMaterialData = materials.ptr();
meshDecl.rotateCharts = false;
xatlas::AddMeshError::Enum error = xatlas::AddUvMesh(atlas, meshDecl);
xatlas::AddMeshError error = xatlas::AddUvMesh(atlas, meshDecl);
ERR_CONTINUE_MSG(error != xatlas::AddMeshError::Success, String("Error adding mesh ") + itos(mesh_i) + String(": ") + xatlas::StringForEnum(error));
mesh_count++;
}
ProTip! Use n and p to navigate between commits in a pull request.