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

Merge branch 'NDK' of https://github.com/DigitalPulseSoftware/NazaraEngine into NDK

Browse Source 
Conflicts:
	include/Nazara/Graphics/SkeletalModel.hpp
	src/Nazara/Graphics/SkeletalModel.cpp

Former-commit-id: 7dba08bc594d501adbc5a81c4ec1a70021eaa5b6
This commit is contained in:
Lynix
2015-05-31 22:18:09 +02:00
parent 847aa234c6 962c1f2362
commit 0f7948ea4c
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Nazara/Graphics/SkeletalModel.cpp
View File

@@ -136,11 +136,6 @@ bool NzSkeletalModel::IsAnimationEnabled() const
return m_animationEnabled;
}
bool NzSkeletalModel::IsDrawable() const
{
return m_mesh != nullptr && m_mesh->GetSubMeshCount() >= 1;
}
bool NzSkeletalModel::LoadFromFile(const NzString& filePath, const NzSkeletalModelParameters& params)
{
return NzSkeletalModelLoader::LoadFromFile(this, filePath, params);