Merge branch 'master' into step-import

2018-09-28 15:59:27 +02:00
parent 78a70baf7c bf347b82ed
commit e38629613c
112 changed files with 2570 additions and 14718 deletions
@@ -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)  {