diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2015-10-19 13:19:52 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-10-22 09:21:30 -0700 |
| commit | df89de5cc5bf043ca2fe57ef4dd9a7b5d25464cb (patch) | |
| tree | ecac13b203cd45451aeff565cb11b179a5ef84d6 /src/mbgl/renderer/painter.cpp | |
| parent | 83d39364f9de987d7840900db2e01673bc1ed6ef (diff) | |
| download | qtlocation-mapboxgl-df89de5cc5bf043ca2fe57ef4dd9a7b5d25464cb.tar.gz | |
[core] Rationalize style property classes: <type>{Paint,Layout}Properties
Diffstat (limited to 'src/mbgl/renderer/painter.cpp')
| -rw-r--r-- | src/mbgl/renderer/painter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp index 5670c4098e..d5dfed4421 100644 --- a/src/mbgl/renderer/painter.cpp +++ b/src/mbgl/renderer/painter.cpp @@ -303,8 +303,8 @@ std::vector<RenderItem> Painter::determineRenderOrder(const Style& style) { if (layer.bucket->visibility == VisibilityType::None) continue; if (layer.type == StyleLayerType::Background) { // This layer defines a background color/image. - if (layer.properties.is<BackgroundProperties>()) { - auto &props = layer.properties.get<BackgroundProperties>(); + if (layer.properties.is<BackgroundPaintProperties>()) { + auto& props = layer.properties.get<BackgroundPaintProperties>(); if (props.image.from.empty()) { // This is a solid background. We can use glClear(). background = props.color; @@ -381,7 +381,7 @@ std::vector<RenderItem> Painter::determineRenderOrder(const Style& style) { void Painter::renderBackground(const StyleLayer &layer_desc) { // Note: This function is only called for textured background. Otherwise, the background color // is created with glClear. - const BackgroundProperties& properties = layer_desc.getProperties<BackgroundProperties>(); + const BackgroundPaintProperties& properties = layer_desc.getProperties<BackgroundPaintProperties>(); if (!properties.image.to.empty()) { if ((properties.opacity >= 1.0f) != (pass == RenderPass::Opaque)) |