summaryrefslogtreecommitdiff
path: root/src/mbgl/renderer/painter_line.cpp
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-04-22 10:00:30 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-04-22 10:00:30 -0700
commit34a2f142e0bdaf488443dc34185f791eba0e94b9 (patch)
tree3d6b820f137b2e4a365ecbaa7a3e74e8c261efb1 /src/mbgl/renderer/painter_line.cpp
parentaf50f8f9b808e6f28dd3e0d78ed6b2470ea2f71f (diff)
downloadqtlocation-mapboxgl-34a2f142e0bdaf488443dc34185f791eba0e94b9.tar.gz
[core] Quarantine style property irregularities in layer classes (#4792)
This moves the *{Layout,Paint}Properties classes closer to code generation.
Diffstat (limited to 'src/mbgl/renderer/painter_line.cpp')
-rw-r--r--src/mbgl/renderer/painter_line.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/renderer/painter_line.cpp b/src/mbgl/renderer/painter_line.cpp
index 1345ba5ea0..80caf9a18c 100644
--- a/src/mbgl/renderer/painter_line.cpp
+++ b/src/mbgl/renderer/painter_line.cpp
@@ -81,8 +81,8 @@ void Painter::renderLine(LineBucket& bucket, const LineLayer& layer, const TileI
LinePatternPos posA = lineAtlas->getDashPosition(properties.lineDasharray.value.from, layout.lineCap == LineCapType::Round, glObjectStore);
LinePatternPos posB = lineAtlas->getDashPosition(properties.lineDasharray.value.to, layout.lineCap == LineCapType::Round, glObjectStore);
- const float widthA = posA.width * properties.lineDasharray.value.fromScale * properties.dashLineWidth;
- const float widthB = posB.width * properties.lineDasharray.value.toScale * properties.dashLineWidth;
+ const float widthA = posA.width * properties.lineDasharray.value.fromScale * layer.dashLineWidth;
+ const float widthB = posB.width * properties.lineDasharray.value.toScale * layer.dashLineWidth;
float scaleXA = 1.0 / id.pixelsToTileUnits(widthA, state.getIntegerZoom());
float scaleYA = -posA.height / 2.0;