From cec3eaa19832e54598239a5747ba329e6607c62e Mon Sep 17 00:00:00 2001
From: Molly Lloyd <molly@mapbox.com>
Date: Wed, 26 Sep 2018 19:45:44 -0700
Subject: [PATCH] [core] fix flickering caused by incorrect ClipIDs we missed a
 check for RenderTile.needsClipping when generating the new ClipIDs for some
 tiles, resulting in incorrect clipping that caused flickering in some cases

---
 src/mbgl/algorithm/generate_clip_ids_impl.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mbgl/algorithm/generate_clip_ids_impl.hpp b/src/mbgl/algorithm/generate_clip_ids_impl.hpp
index 6a316dcda..fedab0602 100644
--- a/src/mbgl/algorithm/generate_clip_ids_impl.hpp
+++ b/src/mbgl/algorithm/generate_clip_ids_impl.hpp
@@ -64,7 +64,7 @@ void ClipIDGenerator::update(std::vector<std::reference_wrapper<Renderable>> ren
         uint8_t count = 1;
         for (auto& it : renderables) {
             auto& renderable = it.get();
-            if (!renderable.used) {
+            if (!renderable.used || !renderable.needsClipping) {
                 continue;
             }
             renderable.clip.mask |= mask;