Merge branch 'master' into master

2018-01-08 15:36:03 +01:00
parent 5ef13e7b38 89a62edb9a
commit 0fff3b1232
7 changed files with 255 additions and 2 deletions
@@ -677,6 +677,8 @@ const aiScene* Importer::ReadFile( const char* _pFile, unsigned int pFlags)
            profiler->EndRegion("import");
        }

+        SetPropertyString("sourceFilePath", pFile);
+
        // If successful, apply all active post processing steps to the imported data
        if( pimpl->mScene)  {