Tim Sylvester
|
9173a1141f
|
Merge branch 'topic/metal-sep25' into metal-sep25-merge
# Conflicts:
# include/mbgl/renderer/layer_tweaker.hpp
# src/mbgl/renderer/layer_tweaker.cpp
# src/mbgl/renderer/layers/circle_layer_tweaker.cpp
# src/mbgl/renderer/layers/fill_layer_tweaker.cpp
# src/mbgl/renderer/layers/heatmap_layer_tweaker.cpp
# src/mbgl/renderer/layers/line_layer_tweaker.cpp
# src/mbgl/renderer/layers/render_circle_layer.cpp
# src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp
# src/mbgl/renderer/layers/render_fill_layer.cpp
# src/mbgl/renderer/layers/render_heatmap_layer.cpp
# src/mbgl/renderer/layers/render_hillshade_layer.cpp
# src/mbgl/renderer/layers/render_line_layer.cpp
# src/mbgl/renderer/layers/render_raster_layer.cpp
# src/mbgl/renderer/layers/render_symbol_layer.cpp
# src/mbgl/renderer/layers/symbol_layer_tweaker.cpp
# src/mbgl/renderer/render_layer.cpp
|
2023-10-03 13:25:02 -07:00 |
|