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

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

pull/21/merge
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
code/OgreImporter.cpp
View File

@ -165,6 +165,15 @@ void OgreImporter::InternReadFile(const std::string &pFile, aiScene *pScene, Ass
//____________________________________________________________ //____________________________________________________________
//skip submeshnames (stupid irrxml)
if(MeshFile->getNodeName()==string("submeshnames"))
{
XmlRead(MeshFile.get());
while(MeshFile->getNodeName()==string("submesh"))
XmlRead(MeshFile.get());
}
//----------------Load the skeleton: ------------------------------- //----------------Load the skeleton: -------------------------------
vector<Bone> Bones; vector<Bone> Bones;
vector<Animation> Animations; vector<Animation> Animations;

5
code/OgreMaterial.cpp
View File

@ -65,9 +65,8 @@ namespace Ogre
aiMaterial* OgreImporter::LoadMaterial(const std::string MaterialName) const 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 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 material Sarg
{ {
@ -143,7 +142,7 @@ aiMaterial* OgreImporter::LoadMaterial(const std::string MaterialName) const
if(NULL==MatFilePtr) if(NULL==MatFilePtr)
{ {
DefaultLogger::get()->error(m_MaterialLibFilename+" and "+MaterialFileName + " could not be opened, Material will not be loaded!"); DefaultLogger::get()->error(m_MaterialLibFilename+" and "+MaterialFileName + " could not be opened, Material will not be loaded!");
return NULL; return new aiMaterial();
} }
} }
} }