diff options
| m--------- | mapbox-gl-js | 0 | ||||
| -rw-r--r-- | src/mbgl/style/layers/circle_layer_impl.cpp | 9 |
2 files changed, 6 insertions, 3 deletions
diff --git a/mapbox-gl-js b/mapbox-gl-js -Subproject 2af18eebca9173ca8e5cf15559f9b16d7c986fc +Subproject fd73395ef71cf77993d717b2e23c5dab5e372b6 diff --git a/src/mbgl/style/layers/circle_layer_impl.cpp b/src/mbgl/style/layers/circle_layer_impl.cpp index 655ad9b5b9..ea1d4eeb65 100644 --- a/src/mbgl/style/layers/circle_layer_impl.cpp +++ b/src/mbgl/style/layers/circle_layer_impl.cpp @@ -14,9 +14,12 @@ void CircleLayer::Impl::cascade(const CascadeParameters& parameters) { bool CircleLayer::Impl::evaluate(const PropertyEvaluationParameters& parameters) { paint.evaluate(parameters); - passes = (paint.evaluated.get<CircleRadius>().constantOr(1) > 0 - && paint.evaluated.get<CircleColor>().constantOr(Color::black()).a > 0 - && paint.evaluated.get<CircleOpacity>().constantOr(1) > 0) + passes = ((paint.evaluated.get<CircleRadius>().constantOr(1) > 0 || + paint.evaluated.get<CircleStrokeWidth>().constantOr(1) > 0) + && (paint.evaluated.get<CircleColor>().constantOr(Color::black()).a > 0 || + paint.evaluated.get<CircleStrokeColor>().constantOr(Color::black()).a > 0) + && (paint.evaluated.get<CircleOpacity>().constantOr(1) > 0 || + paint.evaluated.get<CircleStrokeOpacity>().constantOr(1) > 0)) ? RenderPass::Translucent : RenderPass::None; return paint.hasTransition(); |