[Masking] Fix copy/paste of symbol or converting renderer#60325
Merged
nyalldawson merged 4 commits intoqgis:masterfrom Feb 4, 2025
Merged
[Masking] Fix copy/paste of symbol or converting renderer#60325nyalldawson merged 4 commits intoqgis:masterfrom
nyalldawson merged 4 commits intoqgis:masterfrom
Conversation
Contributor
🪟 Windows buildsDownload Windows builds of this PR for testing. 🪟 Windows Qt6 buildsDownload Windows Qt6 builds of this PR for testing. |
nyalldawson
reviewed
Jan 29, 2025
Both symbol layer ids and masks need to be removed from symbol layers which can be inherited from a converted renderer
2bc81d4 to
dc2e6b3
Compare
nyalldawson
approved these changes
Feb 4, 2025
Collaborator
|
The backport to stderrstdoutTo backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release-3_40 release-3_40
# Navigate to the new working tree
cd .worktrees/backport-release-3_40
# Create a new branch
git switch --create backport-60325-to-release-3_40
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick c26cf427006070f4c11d7712b017efe0a15dac70,24aeb7ea95a6f547d40f1c485d850951c6ab93ed,2bd0d2eaaf1329ac5ba4e611bc67d306d085c0d8,dc2e6b3f79185459ec3f531a7a8021df328c972d
# Push it to GitHub
git push --set-upstream origin backport-60325-to-release-3_40
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-3_40Then, create a pull request where the |
Member
|
Please see #46402 (comment). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Properly reset symbol layer ids when copy/pasting symbol or when converting a rule based renderer into a categorized renderer.
Fixes #46402 where issues comes from symbol layers having identical symbol layers ids, coming from I presume, actions described just above