Merge branch 'master' into master

include/assimp/port/AndroidJNI/AndroidJNIIOSystem.h

@@ -64,7 +64,7 @@ public:
 	AndroidJNIIOSystem(ANativeActivity* activity);
 
     /// Class constructor with past and asset manager.
-	AndroidJNIIOSystem(const char *internalPath, AAssetManager assetManager);
+	AndroidJNIIOSystem(const char *internalPath, AAssetManager* assetManager);
 
 	/// Destructor.
 	~AndroidJNIIOSystem();

port/AndroidJNI/AndroidJNIIOSystem.cpp

@@ -67,8 +67,8 @@ AndroidJNIIOSystem::AndroidJNIIOSystem(ANativeActivity* activity)
 	AndroidActivityInit(activity);
 }
 
-AndroidJNIIOSystem::AndroidJNIIOSystem(const char *internalPath, AAssetManager assetManager) :
-        mApkWorkspacePath(internalDataPath),
+AndroidJNIIOSystem::AndroidJNIIOSystem(const char *internalPath, AAssetManager* assetManager) :
+        mApkWorkspacePath(internalPath),
         mApkAssetManager(assetManager) {
     // empty
 }