Merge master

pull/2175/head
Kim Kulling 2018-09-03 21:59:08 +02:00
parent b191754863
commit d3f1f2337d
1 changed files with 4 additions and 4 deletions

View File

@ -50,14 +50,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <assimp/Importer.hpp>
#include <assimp/importerdesc.h>
#include <assimp/scene.h>
#include <assimp/GenericProperty.h>
#include <assimp/Exceptional.h>
#include <assimp/BaseImporter.h>
#include "CInterfaceIOWrapper.h"
#include "Importer.h"
#include <assimp/Exceptional.h>
#include "ScenePrivate.h"
#include <assimp/BaseImporter.h>
#include <list>
//#include <list>
// ------------------------------------------------------------------------------------------------
#ifndef ASSIMP_BUILD_SINGLETHREADED