Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

[core] Fix sprite sheet merging in Style::Impl::onSpriteLoaded #16211

Merged
merged 3 commits into from
Feb 17, 2020

Conversation

alexshalamov
Copy link
Contributor

@alexshalamov alexshalamov commented Feb 14, 2020

If we get a new sprite sheet from the server, we need to merge current sprite sheet with a new one, while overwriting duplicates and keeping old unique images in a style.

Launch Checklist

  • briefly describe the changes in this PR
  • write tests for all new functionality
  • apply needs changelog label if a changelog is needed (remove label when added)

@alexshalamov alexshalamov added the needs changelog Indicates PR needs a changelog entry prior to merging. label Feb 14, 2020
@alexshalamov alexshalamov force-pushed the alexshalamov_fix_merge_spritesheets branch 3 times, most recently from 11c3fb3 to 0645140 Compare February 15, 2020 11:35
@alexshalamov alexshalamov removed the needs changelog Indicates PR needs a changelog entry prior to merging. label Feb 15, 2020
@alexshalamov alexshalamov marked this pull request as ready for review February 15, 2020 11:35
If we get a new sprite sheet from the server, we need to merge current
sprite sheet with a new one, while overwiting duplicates and keeping
old unique images in a style.
@alexshalamov alexshalamov force-pushed the alexshalamov_fix_merge_spritesheets branch from 4649732 to 6cbac58 Compare February 16, 2020 14:22
Copy link

@mr1sunshine mr1sunshine left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@alexshalamov alexshalamov merged commit f75c9a4 into master Feb 17, 2020
@alexshalamov alexshalamov deleted the alexshalamov_fix_merge_spritesheets branch February 17, 2020 08:14
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants