diff options
| author | Jesse Crocker <jesse@gaiagps.com> | 2017-03-01 11:15:11 -0700 |
|---|---|---|
| committer | Jesse Crocker <jesse@gaiagps.com> | 2017-03-01 11:15:11 -0700 |
| commit | 9e8dc9a9e3e86adb9987ae69766cc42c7d9efece (patch) | |
| tree | f5f0abd4d342c89ad0405d01969f9d6caecc1c90 /src/mbgl/renderer/frame_history.hpp | |
| parent | 16fb0672e64a72b7400c321d55858b73cd5d8c3f (diff) | |
| parent | f28d75dccd9bf4a7615df87faccc5cf5eff8df89 (diff) | |
| download | qtlocation-mapboxgl-9e8dc9a9e3e86adb9987ae69766cc42c7d9efece.tar.gz | |
Merge remote-tracking branch 'origin/master' into feature/custom-vector-source
Diffstat (limited to 'src/mbgl/renderer/frame_history.hpp')
| -rw-r--r-- | src/mbgl/renderer/frame_history.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mbgl/renderer/frame_history.hpp b/src/mbgl/renderer/frame_history.hpp index fffbd113ed..f2b11f5f41 100644 --- a/src/mbgl/renderer/frame_history.hpp +++ b/src/mbgl/renderer/frame_history.hpp @@ -26,7 +26,7 @@ public: private: std::array<TimePoint, 256> changeTimes; std::array<uint8_t, 256> changeOpacities; - const AlphaImage opacities{ { 256, 1 } }; + AlphaImage opacities{ { 256, 1 } }; int16_t previousZoomIndex = 0; TimePoint previousTime; |