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

Non-default blend mode should force raster render of layer #58966

Merged
merged 1 commit into from
Oct 10, 2024

Conversation

nyalldawson
Copy link
Collaborator

Fixes rendering of vector tile and annotation layers with non default blend modes in layouts

Fixes #55629

Fixes rendering of vector tile and annotation layers with non
default blend modes in layouts

Fixes qgis#55629
@github-actions github-actions bot added this to the 3.40.0 milestone Oct 4, 2024
Copy link

github-actions bot commented Oct 4, 2024

🪟 Windows builds ready!

Windows builds of this PR are available for testing here. Debug symbols for this build are available here.

(Built from commit c73f74f)

@nyalldawson nyalldawson merged commit 9ed009f into qgis:master Oct 10, 2024
37 checks passed
@nyalldawson nyalldawson deleted the fix_55629 branch October 10, 2024 01:33
@qgis-bot
Copy link
Collaborator

The backport to queued_ltr_backports failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply c73f74f018d... Non-default blend mode should force raster render of layer
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging src/core/annotations/qgsannotationlayerrenderer.cpp
Auto-merging src/core/vectortile/qgsvectortilelayerrenderer.h
Auto-merging tests/src/python/test_qgsannotationlayer.py
CONFLICT (content): Merge conflict in tests/src/python/test_qgsannotationlayer.py
Auto-merging tests/src/python/test_qgsvectortile.py

To 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-queued_ltr_backports queued_ltr_backports
# Navigate to the new working tree
cd .worktrees/backport-queued_ltr_backports
# Create a new branch
git switch --create backport-58966-to-queued_ltr_backports
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick c73f74f018d0a50c4fc897578e27d08813049777
# Push it to GitHub
git push --set-upstream origin backport-58966-to-queued_ltr_backports
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-queued_ltr_backports

Then, create a pull request where the base branch is queued_ltr_backports and the compare/head branch is backport-58966-to-queued_ltr_backports.

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Oct 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport queued_ltr_backports Queued Backports failed backport The automated backport attempt failed, needs a manual backport
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Blended vectortile layer not rendered correctly in layouts
3 participants