tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into release-boba

Browse Source 
# Conflicts:
#	platform/android/CHANGELOG.md
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java
#	platform/android/scripts/exclude-activity-gen.json
#	platform/ios/CHANGELOG.md
#	platform/ios/Mapbox-iOS-SDK-nightly-dynamic.podspec
#	platform/ios/Mapbox-iOS-SDK-symbols.podspec
#	platform/ios/Mapbox-iOS-SDK.podspec
#	platform/macos/CHANGELOG.md
This commit is contained in:
Fabian Guerra
2018-02-15 11:54:51 -05:00
parent c83dc310aa 82de856c94
commit 903e7989ec
191 changed files with 6365 additions and 814 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/android/src/native_map_view.cpp
View File

@@ -450,7 +450,7 @@ jni::Array<jni::jlong> NativeMapView::addMarkers(jni::JNIEnv& env, jni::Array<jn
}
void NativeMapView::onLowMemory(JNIEnv&) {
rendererFrontend->onLowMemory();
rendererFrontend->reduceMemoryUse();
}
using DebugOptions = mbgl::MapDebugOptions;