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

Merge pull request #52 from asmaloney/minor_changes 

Fix a logging message and a comment
pull/51/merge
Alexander Gessler 2013-06-12 08:15:52 -07:00
parent 9040724fc0 c6d1a73854
commit 84e3bf50ba
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/ASEParser.cpp
View File

@ -1567,8 +1567,8 @@ void Parser::ParseLV4MeshBones(unsigned int iNumBones,ASE::Mesh& mesh)
unsigned int iIndex = strtoul10(filePtr,&filePtr); unsigned int iIndex = strtoul10(filePtr,&filePtr);
if (iIndex >= iNumBones) if (iIndex >= iNumBones)
{ {
continue;
LogWarning("Bone index is out of bounds"); LogWarning("Bone index is out of bounds");
continue;
} }
if (!ParseString(mesh.mBones[iIndex].mName,"*MESH_BONE_NAME")) if (!ParseString(mesh.mBones[iIndex].mName,"*MESH_BONE_NAME"))
SkipToNextToken(); SkipToNextToken();

2
include/assimp/config.h
View File

@ -403,7 +403,7 @@ enum aiComponent
* use the #aiProcess_OptimizeGraph step to do this */ * use the #aiProcess_OptimizeGraph step to do this */
aiComponent_LIGHTS = 0x100, aiComponent_LIGHTS = 0x100,
/** Removes all light sources (aiScene::mCameras). /** Removes all cameras (aiScene::mCameras).
* The corresponding scenegraph nodes are NOT removed. * The corresponding scenegraph nodes are NOT removed.
* use the #aiProcess_OptimizeGraph step to do this */ * use the #aiProcess_OptimizeGraph step to do this */
aiComponent_CAMERAS = 0x200, aiComponent_CAMERAS = 0x200,