Skip to content

Sync branch 2.5 to 2.6 - #16079

Merged
ronso0 merged 15 commits into
2.6from
sync-branch-2.5-to-2.6
Mar 3, 2026
Merged

Sync branch 2.5 to 2.6#16079
ronso0 merged 15 commits into
2.6from
sync-branch-2.5-to-2.6

Conversation

@acolombier

Copy link
Copy Markdown
Member

Addressing conflict listed in #15589

daschuer and others added 15 commits February 27, 2026 09:12
…lse positive "First sound has been moved!" messages-
Fix false positive "First sound has been moved!" warnings
build: Fix invalid elseif syntax in Apple platform checks
fixed glitch effect by removing cast to integer
Avoid conditional jump that depends on uninitialized memory
(fix) History: allow track file export
chore: pin eslint-plugin-diff to workaround git ref issue
Comment thread src/engine/cachingreader/cachingreaderworker.cpp
@github-actions github-actions Bot added effects library engine build code quality developer experience Issues, bugs and PRs related to the development process, development environment & developer docs labels Mar 1, 2026
@acolombier

Copy link
Copy Markdown
Member Author

@ronso0 are you able to review this?
This would unblock #16037

@ronso0

ronso0 commented Mar 3, 2026

Copy link
Copy Markdown
Member

@ronso0 are you able to review this?

As a whole? No 😆
I trust CI and your resolution of the reader conflicts.

@ronso0
ronso0 merged commit b3ac98a into 2.6 Mar 3, 2026
53 of 76 checks passed
@ronso0
ronso0 deleted the sync-branch-2.5-to-2.6 branch March 3, 2026 09:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

build code quality developer experience Issues, bugs and PRs related to the development process, development environment & developer docs effects engine library sync-branches

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants