commit
65265594ba
|
@ -684,7 +684,8 @@ if(WIN32)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
IF(MSVC_TOOLSET_VERSION)
|
IF(MSVC_TOOLSET_VERSION)
|
||||||
set(MSVC_PREFIX "vc${MSVC_TOOLSET_VERSION}")
|
SET(MSVC_PREFIX "vc${MSVC_TOOLSET_VERSION}")
|
||||||
|
SET(ASSIMP_MSVC_VERSION ${MCVS_PREFIX})
|
||||||
ELSE()
|
ELSE()
|
||||||
IF(MSVC12)
|
IF(MSVC12)
|
||||||
SET(ASSIMP_MSVC_VERSION "vc120")
|
SET(ASSIMP_MSVC_VERSION "vc120")
|
||||||
|
|
|
@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
|
||||||
|
|
||||||
Copyright (c) 2006-2020, assimp team
|
Copyright (c) 2006-2020, assimp team
|
||||||
|
|
||||||
|
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use of this software in source and binary forms,
|
Redistribution and use of this software in source and binary forms,
|
||||||
|
@ -40,7 +39,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
----------------------------------------------------------------------
|
----------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/** @file Definition of the base class for all importer worker classes. */
|
/// @file Definition of the base class for all importer worker classes.
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
#ifndef INCLUDED_AI_BASEIMPORTER_H
|
#ifndef INCLUDED_AI_BASEIMPORTER_H
|
||||||
#define INCLUDED_AI_BASEIMPORTER_H
|
#define INCLUDED_AI_BASEIMPORTER_H
|
||||||
|
@ -87,10 +87,6 @@ class IOStream;
|
||||||
class ASSIMP_API BaseImporter {
|
class ASSIMP_API BaseImporter {
|
||||||
friend class Importer;
|
friend class Importer;
|
||||||
|
|
||||||
private:
|
|
||||||
/* Pushes state into importer for the importer scale */
|
|
||||||
virtual void UpdateImporterScale(Importer *pImp);
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
/** Constructor to be privately used by #Importer */
|
/** Constructor to be privately used by #Importer */
|
||||||
BaseImporter() AI_NO_EXCEPT;
|
BaseImporter() AI_NO_EXCEPT;
|
||||||
|
@ -410,6 +406,10 @@ public: // static utilities
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
/* Pushes state into importer for the importer scale */
|
||||||
|
virtual void UpdateImporterScale(Importer *pImp);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
/// Error description in case there was one.
|
/// Error description in case there was one.
|
||||||
std::string m_ErrorText;
|
std::string m_ErrorText;
|
||||||
|
|
Loading…
Reference in New Issue