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

NFF: Add assertions to silence static analyzer warnings

pull/1498/head
Turo Lamminen 2017-11-07 19:38:31 +02:00
parent 3f299b2a2b
commit f90019bc1e
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/NFFLoader.cpp
View File

@ -1079,6 +1079,7 @@ void NFFImporter::InternReadFile( const std::string& pFile,
// generate the camera // generate the camera
if (hasCam) if (hasCam)
{ {
ai_assert(ppcChildren);
aiNode* nd = new aiNode(); aiNode* nd = new aiNode();
*ppcChildren = nd; *ppcChildren = nd;
nd->mName.Set("<NFF_Camera>"); nd->mName.Set("<NFF_Camera>");
@ -1104,6 +1105,7 @@ void NFFImporter::InternReadFile( const std::string& pFile,
// generate light sources // generate light sources
if (!lights.empty()) if (!lights.empty())
{ {
ai_assert(ppcChildren);
pScene->mNumLights = (unsigned int)lights.size(); pScene->mNumLights = (unsigned int)lights.size();
pScene->mLights = new aiLight*[pScene->mNumLights]; pScene->mLights = new aiLight*[pScene->mNumLights];
for (unsigned int i = 0; i < pScene->mNumLights;++i,++ppcChildren) for (unsigned int i = 0; i < pScene->mNumLights;++i,++ppcChildren)