summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Loer <chris.loer@gmail.com>2017-10-31 13:40:08 -0700
committerChris Loer <chris.loer@mapbox.com>2017-11-01 10:49:07 -0700
commit9fa0fe759076cc2c7fd1d59461e3e97cddec1601 (patch)
tree3a032413ea1a55c7fb64f903735d6ae7a9b61311
parent542b45d201438b2832c2ed415a57671218427a0e (diff)
downloadqtlocation-mapboxgl-9fa0fe759076cc2c7fd1d59461e3e97cddec1601.tar.gz
Make sure to sort all symbol buckets the first time we get them ready for upload.
-rw-r--r--src/mbgl/renderer/buckets/symbol_bucket.cpp2
-rw-r--r--src/mbgl/renderer/buckets/symbol_bucket.hpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/renderer/buckets/symbol_bucket.cpp b/src/mbgl/renderer/buckets/symbol_bucket.cpp
index cf8120739a..f11679aafa 100644
--- a/src/mbgl/renderer/buckets/symbol_bucket.cpp
+++ b/src/mbgl/renderer/buckets/symbol_bucket.cpp
@@ -150,7 +150,7 @@ void SymbolBucket::sortFeatures(const float angle) {
return;
}
- if (sortedAngle == angle) {
+ if (sortedAngle && *sortedAngle == angle) {
return;
}
diff --git a/src/mbgl/renderer/buckets/symbol_bucket.hpp b/src/mbgl/renderer/buckets/symbol_bucket.hpp
index 81053b3307..da8514c4cf 100644
--- a/src/mbgl/renderer/buckets/symbol_bucket.hpp
+++ b/src/mbgl/renderer/buckets/symbol_bucket.hpp
@@ -64,7 +64,7 @@ public:
const bool iconsNeedLinear;
const bool sortFeaturesByY;
- float sortedAngle = 0;
+ optional<float> sortedAngle;
bool staticUploaded = false;
bool opacityUploaded = false;