summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnsis Brammanis <ansis@mapbox.com>2017-10-25 16:05:14 -0400
committerAnsis Brammanis <ansis@mapbox.com>2017-10-25 16:05:14 -0400
commit9c4b5b6ce944518af95680240b1f88dabb502f6d (patch)
tree7a795bd4ad9bc43ea09c35c05fcff76e4c67ce65
parent68ad044edc5ba4f8efffd4dffd9f9ccab9e95fc0 (diff)
downloadqtlocation-mapboxgl-upstream/start-collision-fading.tar.gz
fix collision box opacity [skip ci]upstream/start-collision-fading
-rw-r--r--src/mbgl/text/placement.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/text/placement.cpp b/src/mbgl/text/placement.cpp
index 08add2b27e..32a09ad73e 100644
--- a/src/mbgl/text/placement.cpp
+++ b/src/mbgl/text/placement.cpp
@@ -231,8 +231,8 @@ void Placement::updateBucketOpacities(SymbolBucket& bucket, gl::Context& context
}
};
- updateCollisionBox(symbolInstance.textCollisionFeature, symbolInstance.placedText);
- updateCollisionBox(symbolInstance.iconCollisionFeature, symbolInstance.placedIcon);
+ updateCollisionBox(symbolInstance.textCollisionFeature, opacityState.text.targetOpacity == 1.0);
+ updateCollisionBox(symbolInstance.iconCollisionFeature, opacityState.icon.targetOpacity == 1.0);
}
if (bucket.hasTextData()) context.updateVertexBuffer(*bucket.text.opacityVertexBuffer, std::move(bucket.text.opacityVertices));