Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 5093294573486080

Browse Source
This commit is contained in:
Kim Kulling
2023-06-27 17:04:58 +02:00
committed by GitHub
parent c6c95b69f6 1791eac7ff
commit 1ec3dbd11a
24 changed files with 2535 additions and 2398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/AssetLib/MDL/MDLMaterialLoader.cpp
View File

@@ -495,12 +495,12 @@ void MDLImporter::ParseSkinLump_3DGS_MDL7(
aiString szFile;
const size_t iLen = strlen((const char *)szCurrent);
size_t iLen2 = iLen + 1;
iLen2 = iLen2 > MAXLEN ? MAXLEN : iLen2;
size_t iLen2 = iLen > (MAXLEN - 1) ? (MAXLEN - 1) : iLen;
memcpy(szFile.data, (const char *)szCurrent, iLen2);
szFile.data[iLen2] = '\0';
szFile.length = static_cast<ai_uint32>(iLen2);
szCurrent += iLen2;
szCurrent += iLen2 + 1;
// place this as diffuse texture
pcMatOut->AddProperty(&szFile, AI_MATKEY_TEXTURE_DIFFUSE(0));