v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into issue-1262

pull/1272/head
Kim Kulling 2017-05-16 21:53:35 +02:00 committed by GitHub
parent 6c70edaf28 ff7624f06f
commit 3f68278ea0
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/BlenderLoader.cpp
View File

@ -110,6 +110,7 @@ BlenderImporter::~BlenderImporter()
} }
static const char* Tokens[] = { "BLENDER" }; static const char* Tokens[] = { "BLENDER" };
static const char* TokensForSearch[] = { "blender" };
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
// Returns whether the class can handle the format of the given file. // Returns whether the class can handle the format of the given file.
@ -122,7 +123,7 @@ bool BlenderImporter::CanRead( const std::string& pFile, IOSystem* pIOHandler, b
else if ((!extension.length() || checkSig) && pIOHandler) { else if ((!extension.length() || checkSig) && pIOHandler) {
// note: this won't catch compressed files // note: this won't catch compressed files
return SearchFileHeaderForToken(pIOHandler,pFile, Tokens,1); return SearchFileHeaderForToken(pIOHandler,pFile, TokensForSearch,1);
} }
return false; return false;
} }

2
code/RemoveVCProcess.cpp
View File

@ -306,7 +306,7 @@ bool RemoveVCProcess::ProcessMesh(aiMesh* pMesh)
if (!pMesh->mColors[i])break; if (!pMesh->mColors[i])break;
if (configDeleteFlags & aiComponent_COLORSn(i) || b) if (configDeleteFlags & aiComponent_COLORSn(i) || b)
{ {
delete pMesh->mColors[i]; delete [] pMesh->mColors[i];
pMesh->mColors[i] = NULL; pMesh->mColors[i] = NULL;
ret = true; ret = true;

2
test/unit/utRemoveVCProcess.cpp
View File

@ -72,6 +72,4 @@ TEST_F( utRevmoveVCProcess, issue1266_ProcessMeshTest_NoCrash ) {
scene->mMeshes[ 0 ] = mesh; scene->mMeshes[ 0 ] = mesh;
RemoveVCProcess *process = new RemoveVCProcess; RemoveVCProcess *process = new RemoveVCProcess;
process->Execute( scene ); process->Execute( scene );
} }