diff options
| author | Young Hahn <young@mapbox.com> | 2016-06-15 11:38:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-15 11:38:22 -0400 |
| commit | 24b66bc8cdd40a52e08d198c063daa3e1f6be92a (patch) | |
| tree | 6d98a5e1216a83f7d6d4c78422c8306d4a4cb157 /src/mbgl/style/layers/symbol_layer_impl.cpp | |
| parent | fe64238b4cd5a7da403a4f29a62b14234ecba569 (diff) | |
| download | qtlocation-mapboxgl-24b66bc8cdd40a52e08d198c063daa3e1f6be92a.tar.gz | |
Color class (#5361)
* Color class
* Switch to list initialization
Diffstat (limited to 'src/mbgl/style/layers/symbol_layer_impl.cpp')
| -rw-r--r-- | src/mbgl/style/layers/symbol_layer_impl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/style/layers/symbol_layer_impl.cpp b/src/mbgl/style/layers/symbol_layer_impl.cpp index 34438285c5..eeceb52078 100644 --- a/src/mbgl/style/layers/symbol_layer_impl.cpp +++ b/src/mbgl/style/layers/symbol_layer_impl.cpp @@ -26,8 +26,8 @@ bool SymbolLayer::Impl::recalculate(const CalculationParameters& parameters) { iconSize = layout.iconSize; textSize = layout.textSize; - passes = ((paint.iconOpacity > 0 && (paint.iconColor.value[3] > 0 || paint.iconHaloColor.value[3] > 0) && iconSize > 0) - || (paint.textOpacity > 0 && (paint.textColor.value[3] > 0 || paint.textHaloColor.value[3] > 0) && textSize > 0)) + passes = ((paint.iconOpacity > 0 && (paint.iconColor.value.a > 0 || paint.iconHaloColor.value.a > 0) && iconSize > 0) + || (paint.textOpacity > 0 && (paint.textColor.value.a > 0 || paint.textHaloColor.value.a > 0) && textSize > 0)) ? RenderPass::Translucent : RenderPass::None; return hasTransitions; |