Skip to content
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.

Sign up for GitHub

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

Fix invalid read of uint from uvwsrc #5282

Merged
merged 3 commits into from
Nov 14, 2023
Merged

Fix invalid read of uint from uvwsrc #5282

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f2d924
Read int from uvwsrc
JulianKnodt Oct 17, 2023
54a86e6
Merge branch 'master' into uvwsrc_read
kimkulling Nov 8, 2023
7a45fb3
Merge branch 'master' into uvwsrc_read
kimkulling Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion code/AssetLib/glTF2/glTF2Exporter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,11 @@ void glTF2Exporter::GetMatTex(const aiMaterial &mat, Ref<Texture> &texture, unsi
aiString tex;

// Read texcoord (UV map index)
mat.Get(AI_MATKEY_UVWSRC(tt, slot), texCoord);
// Note: must be an int to be successful.
int tmp = 0;
const auto ok = mat.Get(AI_MATKEY_UVWSRC(tt, slot), tmp);
if (ok == aiReturn_SUCCESS) texCoord = tmp;


if (mat.Get(AI_MATKEY_TEXTURE(tt, slot), tex) == AI_SUCCESS) {
std::string path = tex.C_Str();
Expand Down
Loading