Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ogre: Material nullptr-fix, Loader is hopefully no longer confused by 'submeshnames' tag

Browse Source
This commit is contained in:
Jonathan Klein
2013-03-16 20:59:47 +01:00
committed by Kim
parent 8213805dc6
commit fe19ba9da6
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/OgreMaterial.cpp
View File

@@ -65,9 +65,8 @@ namespace Ogre
aiMaterial* OgreImporter::LoadMaterial(const std::string MaterialName) const
{
const aiScene* const m_CurrentScene=this->m_CurrentScene;//make sure, that we can access but not change the scene
(void)m_CurrentScene;
/*For bettetr understanding of the material parser, here is a material example file:
/*For better understanding of the material parser, here is a material example file:
material Sarg
{
@@ -143,7 +142,7 @@ aiMaterial* OgreImporter::LoadMaterial(const std::string MaterialName) const
if(NULL==MatFilePtr)
{
DefaultLogger::get()->error(m_MaterialLibFilename+" and "+MaterialFileName + " could not be opened, Material will not be loaded!");
return NULL;
return new aiMaterial();
}
}
}