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

Fix static init ordering bug in OpenGEX importer

pull/1253/head
rdb 2017-05-01 15:11:22 +02:00
parent 3f361ecc1f
commit 0069552183
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/OpenGEXImporter.cpp
View File

@ -52,8 +52,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <vector> #include <vector>
static const std::string OpenGexExt = "ogex";
static const aiImporterDesc desc = { static const aiImporterDesc desc = {
"Open Game Engine Exchange", "Open Game Engine Exchange",
"", "",
@ -64,7 +62,7 @@ static const aiImporterDesc desc = {
0, 0,
0, 0,
0, 0,
OpenGexExt.c_str() "ogex"
}; };
namespace Grammar { namespace Grammar {
@ -289,7 +287,7 @@ OpenGEXImporter::~OpenGEXImporter() {
bool OpenGEXImporter::CanRead( const std::string &file, IOSystem *pIOHandler, bool checkSig ) const { bool OpenGEXImporter::CanRead( const std::string &file, IOSystem *pIOHandler, bool checkSig ) const {
bool canRead( false ); bool canRead( false );
if( !checkSig ) { if( !checkSig ) {
canRead = SimpleExtensionCheck( file, OpenGexExt.c_str() ); canRead = SimpleExtensionCheck( file, "ogex" );
} else { } else {
static const char *token[] = { "Metric", "GeometryNode", "VertexArray (attrib", "IndexArray" }; static const char *token[] = { "Metric", "GeometryNode", "VertexArray (attrib", "IndexArray" };
canRead = BaseImporter::SearchFileHeaderForToken( pIOHandler, file, token, 4 ); canRead = BaseImporter::SearchFileHeaderForToken( pIOHandler, file, token, 4 );