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

OgreImporter: Forgot to rebuild after filename changes so broke the build. Fix includes, add include guards and ASSIMP_BUILD_NO_OGRE_IMPORTER to missing places.

Browse Source
This commit is contained in:
Jonne Nauha
2014-05-01 17:19:03 +03:00
parent fcb97bb595
commit 45715df263
6 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/OgreImporter.cpp
View File

@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <vector>
#include <sstream>
#include "OgreImporter.hpp"
#include "OgreImporter.h"
#include "TinyFormatter.h"
#include "irrXMLWrapper.h"
@@ -74,7 +74,8 @@ bool OgreImporter::CanRead(const std::string &pFile, Assimp::IOSystem *pIOHandle
{
string ext = "mesh.xml";
int len = ext.length();
return (ASSIMP_stricmp(pFile.substr(pFile.length()-len, len), ext) == 0);
string fileExt = ToLower(pFile.substr(pFile.length()-len, len));
return (ASSIMP_stricmp(fileExt, ext) == 0);
}
const char* tokens[] = {"<mesh>"};
return BaseImporter::SearchFileHeaderForToken(pIOHandler, pFile, tokens, 1);