summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-06-15 17:28:47 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-06-15 17:28:47 -0700
commit7e1a9b72744d629181a6ffb0072f7eab1cb05546 (patch)
treeb92cd3d0603c5abfc5b939dabdecef3c90ece91b
parenta0b298211908036da269e7dcc2c78025476e2bf2 (diff)
downloadqtlocation-mapboxgl-7e1a9b72744d629181a6ffb0072f7eab1cb05546.tar.gz
[core] Update test suite; use linear interpolation for rotated icons
-rw-r--r--package.json2
-rw-r--r--src/mbgl/renderer/symbol_bucket.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/package.json b/package.json
index fcf5ee9bc4..5785994247 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
"express": "^4.11.1",
"mapbox-gl-shaders": "mapbox/mapbox-gl-shaders#59e998295d548f208ee3ec10cdd21ff2630e2079",
"mapbox-gl-style-spec": "mapbox/mapbox-gl-style-spec#194fc55b6a7dd54c1e2cf2dd9048fbb5e836716d",
- "mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#146a348f1768ce13e153fce3b32bbed469aa5fe4",
+ "mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#05d8865cf38920d5d15de0e410475514d6edace0",
"node-gyp": "^3.3.1",
"request": "^2.72.0",
"tape": "^4.5.1"
diff --git a/src/mbgl/renderer/symbol_bucket.cpp b/src/mbgl/renderer/symbol_bucket.cpp
index 496745dda1..d853265861 100644
--- a/src/mbgl/renderer/symbol_bucket.cpp
+++ b/src/mbgl/renderer/symbol_bucket.cpp
@@ -282,6 +282,8 @@ void SymbolBucket::addFeatures(uintptr_t tileUID,
}
if ((*image).relativePixelRatio != 1.0f) {
iconsNeedLinear = true;
+ } else if (layout.iconRotate != 0) {
+ iconsNeedLinear = true;
}
}
}