1 files changed, 3 insertions, 2 deletions
diff --git a/src/mbgl/renderer/layers/render_background_layer.cpp b/src/mbgl/renderer/layers/render_background_layer.cpp
index 51c4f2ae4f..71216811a5 100644
--- a/src/mbgl/renderer/layers/render_background_layer.cpp
+++ b/src/mbgl/renderer/layers/render_background_layer.cpp
@@ -41,6 +41,7 @@ void RenderBackgroundLayer::evaluate(const PropertyEvaluationParameters &paramet
     if (passes != RenderPass::None && !properties->evaluated.get<style::BackgroundPattern>().to.empty()) {
         passes |= RenderPass::Upload;
     }
+    properties->renderPasses = mbgl::underlying_type(passes);
     evaluatedProperties = std::move(properties);
 }
 
@@ -142,8 +143,8 @@ void RenderBackgroundLayer::render(PaintParameters& parameters, RenderSource*) {
 }
 
 optional<Color> RenderBackgroundLayer::getSolidBackground() const {
-    const auto& evaluated = static_cast<const BackgroundLayerProperties&>(*evaluatedProperties).evaluated;
-    if (!evaluated.get<BackgroundPattern>().from.empty()) {
+    const auto& evaluated = getEvaluated<BackgroundLayerProperties>(evaluatedProperties);
+    if (!evaluated.get<BackgroundPattern>().from.empty() || evaluated.get<style::BackgroundOpacity>() <= 0.0f) {
         return nullopt;
     }