diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-10 11:34:00 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-15 09:45:55 -0700 |
| commit | da4d735e2c465195e0fb9531ce9d4d7c5c9e6503 (patch) | |
| tree | d7145d5f884420703d0a1bb03a0492eebf05b160 /src/mbgl/renderer/buckets/symbol_bucket.cpp | |
| parent | 2690a65f8dc9e920c16af3264864321295f7daa8 (diff) | |
| download | qtlocation-mapboxgl-da4d735e2c465195e0fb9531ce9d4d7c5c9e6503.tar.gz | |
[core] Unify {Paint,Layout,Light}Properties
Diffstat (limited to 'src/mbgl/renderer/buckets/symbol_bucket.cpp')
| -rw-r--r-- | src/mbgl/renderer/buckets/symbol_bucket.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mbgl/renderer/buckets/symbol_bucket.cpp b/src/mbgl/renderer/buckets/symbol_bucket.cpp index 423161f24c..bc4e5f57cb 100644 --- a/src/mbgl/renderer/buckets/symbol_bucket.cpp +++ b/src/mbgl/renderer/buckets/symbol_bucket.cpp @@ -10,7 +10,8 @@ using namespace style; SymbolBucket::SymbolBucket(style::SymbolLayoutProperties::PossiblyEvaluated layout_, const std::map<std::string, std::pair< - style::IconPaintProperties::Evaluated, style::TextPaintProperties::Evaluated>>& layerPaintProperties, + style::IconPaintProperties::PossiblyEvaluated, + style::TextPaintProperties::PossiblyEvaluated>>& layerPaintProperties, const style::DataDrivenPropertyValue<float>& textSize, const style::DataDrivenPropertyValue<float>& iconSize, float zoom, |