Merge branch 'step-import' of https://github.com/assimp/assimp into step-import

2018-09-28 18:02:54 +02:00
parent 3249409243 4003309e7a
commit 35374e777b
117 changed files with 18966 additions and 14827 deletions
--- a/code/Assimp.cpp
+++ b/code/Assimp.cpp
@@ -272,8 +272,6 @@ void aiReleaseImport( const aiScene* pScene)

    ASSIMP_BEGIN_EXCEPTION_REGION();

-    aiReleaseDefaultMaterial();
-
    // find the importer associated with this data
    const ScenePrivateData* priv = ScenePriv(pScene);
    if( !priv || !priv->mOrigImporter)  {