1 files changed, 16 insertions, 6 deletions
diff --git a/src/mbgl/renderer/renderer_impl.cpp b/src/mbgl/renderer/renderer_impl.cpp
index dc53f20110..4f9b6b248b 100644
--- a/src/mbgl/renderer/renderer_impl.cpp
+++ b/src/mbgl/renderer/renderer_impl.cpp
@@ -243,12 +243,22 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) {
             filteredLayers.push_back(layer);
         }
 
-        //TODO: AHM: Send feature states
-        renderSources.at(source->id)->update(source,
-                                             filteredLayers,
-                                             needsRendering,
-                                             needsRelayout,
-                                             tileParameters);
+        const auto changeSet = updateParameters.stateChanges->find(source->id);
+        if (changeSet != updateParameters.stateChanges->end()) {
+            renderSources.at(source->id)->update(source,
+                                                 filteredLayers,
+                                                 changeSet->second,
+                                                 needsRendering,
+                                                 needsRelayout,
+                                                 tileParameters);
+        }
+        else {
+            renderSources.at(source->id)->update(source,
+                                                 filteredLayers,
+                                                 needsRendering,
+                                                 needsRelayout,
+                                                 tileParameters);
+        }
     }
 
     transformState = updateParameters.transformState;