sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Various little fixes (#118)

Browse Source 
* Add missing override qualifier

* Mostly shadowing, virtual destructor and other little things
This commit is contained in:
Gawaboumga
2017-02-19 23:15:13 +01:00
committed by Jérôme Leclercq
parent ee9712fdcd
commit c2e4ccaf72
38 changed files with 94 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/Assimp/Plugin.cpp
View File

@@ -141,12 +141,12 @@ bool Load(Mesh* mesh, Stream& stream, const MeshParams& parameters)
{
for (unsigned int i = 0; i < scene->mNumMeshes; ++i)
{
aiMesh* mesh = scene->mMeshes[i];
if (mesh->HasBones()) // Inline functions can be safely called
aiMesh* currentMesh = scene->mMeshes[i];
if (currentMesh->HasBones()) // Inline functions can be safely called
{
animatedMesh = true;
for (unsigned int j = 0; j < mesh->mNumBones; ++j)
joints.insert(mesh->mBones[j]->mName.C_Str());
for (unsigned int j = 0; j < currentMesh->mNumBones; ++j)
joints.insert(currentMesh->mBones[j]->mName.C_Str());
}
}
}