v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into master

pull/4146/head
Kim Kulling 2021-10-29 19:35:27 +02:00 committed by GitHub
parent e900617796 7f4839a26c
commit 322de54323
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/assimp/port/AndroidJNI/AndroidJNIIOSystem.h
View File

@ -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();

4
port/AndroidJNI/AndroidJNIIOSystem.cpp
View File

@ -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
}