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

replace NULL by nullptr on loadFile.

Browse Source
This commit is contained in:
Kim Kulling
2020-06-21 12:03:38 +02:00
parent abb628bc58
commit 6397bfbf90
13 changed files with 38 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/MD5/MD5Loader.cpp
+5 -6
View File
@@ -332,13 +332,12 @@ void MD5Importer::AttachChilds_Anim(int iParentID, aiNode *piParent, AnimBoneLis
// ------------------------------------------------------------------------------------------------
// Load a MD5MESH file
void MD5Importer::LoadMD5MeshFile() {
std::string pFile = mFile + "md5mesh";
std::unique_ptr<IOStream> file(mIOHandler->Open(pFile, "rb"));
std::string filename = mFile + "md5mesh";
std::unique_ptr<IOStream> file(mIOHandler->Open(filename, "rb"));
// Check whether we can read from the file
if (file.get() == nullptr || !file->FileSize()) {
ASSIMP_LOG_WARN("Failed to access MD5MESH file: " + pFile);
return;
throw DeadlyImportError("Failed to open MD5 file " + filename + ".");
}
bHadMD5Mesh = true;
LoadFileIntoMemory(file.get());
@@ -552,9 +551,9 @@ void MD5Importer::LoadMD5AnimFile() {
// Check whether we can read from the file
if (!file.get() || !file->FileSize()) {
ASSIMP_LOG_WARN("Failed to read MD5ANIM file: " + pFile);
return;
throw DeadlyImportError("Failed to open MD3 file " + file + ".");
}
LoadFileIntoMemory(file.get());
// parse the basic file structure