diff options
| author | Andy Nichols <andy.nichols@qt.io> | 2025-06-10 12:58:18 +0200 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@qt.io> | 2025-06-10 12:59:03 +0200 |
| commit | 488a2f7af2920295ada886f113a0d563dab79b8d (patch) | |
| tree | 60618a0947d45081caf6c5038cee9706e4af4ae0 /code/AssetLib/NFF | |
| parent | 647f94648c0ae24b9c6684383a9dbbc0e2fc23b7 (diff) | |
| parent | fb375dd8c0a032106a2122815fb18dffe0283721 (diff) | |
Merge tag 'v6.0.2' into qt6_assimpqt6_assimp
Change-Id: I70ab8ef899f760cfa3ef8406419ecdb976d6ffc3
Diffstat (limited to 'code/AssetLib/NFF')
| -rw-r--r-- | code/AssetLib/NFF/NFFLoader.cpp | 6 | ||||
| -rw-r--r-- | code/AssetLib/NFF/NFFLoader.h | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/code/AssetLib/NFF/NFFLoader.cpp b/code/AssetLib/NFF/NFFLoader.cpp index 481a4bc19..4aaaaa64f 100644 --- a/code/AssetLib/NFF/NFFLoader.cpp +++ b/code/AssetLib/NFF/NFFLoader.cpp @@ -3,7 +3,7 @@ Open Asset Import Library (assimp) --------------------------------------------------------------------------- -Copyright (c) 2006-2024, assimp team +Copyright (c) 2006-2025, assimp team All rights reserved. @@ -546,9 +546,9 @@ void NFFImporter::InternReadFile(const std::string &file, aiScene *pScene, IOSys // We need to add a new mesh to the list. We assign // an unique name to it to make sure the scene will // pass the validation step for the moment. - // TODO: fix naming of objects in the scenegraph later + // TODO: fix naming of objects in the scene-graph later if (objectName.length()) { - ::strcpy(mesh->name, objectName.c_str()); + ::strncpy(mesh->name, objectName.c_str(), objectName.size()); ASSIMP_itoa10(&mesh->name[objectName.length()], 30, subMeshIdx++); } diff --git a/code/AssetLib/NFF/NFFLoader.h b/code/AssetLib/NFF/NFFLoader.h index dfa6a882f..0018474ba 100644 --- a/code/AssetLib/NFF/NFFLoader.h +++ b/code/AssetLib/NFF/NFFLoader.h @@ -2,8 +2,7 @@ Open Asset Import Library (assimp) ---------------------------------------------------------------------- -Copyright (c) 2006-2024, assimp team - +Copyright (c) 2006-2025, assimp team All rights reserved. |