Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync v3.1.2 release to the main branch #13064

Merged
merged 7 commits into from
Jan 29, 2024
Merged

Sync v3.1.2 release to the main branch #13064

merged 7 commits into from
Jan 29, 2024

Conversation

stepankuzmin
Copy link
Contributor

Caution

Don't merge with the green button! The merge should be done manually with fast-forward:

git checkout main
git pull origin main
git merge sync-v3.1.2 --ff-only
git push origin main

Takes precedence over #13063

jtorresfabra and others added 7 commits January 29, 2024 18:18
Fill extrusions were being split to subtiles (for optimization) when no globe, but this behaviour is incorrect for alternative projections. The fix is just to split to subtiles when in mercator projection
* Revert "Disable instanced halo rendering (internal-1063)"

This reverts commit 747c6be3d7231780fe0eb77a0a17a41afcb8bcf6.

* Drop float from varyings
@stepankuzmin stepankuzmin merged commit 1bc8e9b into main Jan 29, 2024
28 checks passed
@stepankuzmin stepankuzmin deleted the sync-v3.1.2 branch January 29, 2024 18:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants