Bring 5.2.4.0 up to date with main #8

Open
Yusarina wants to merge 3 commits from main into 5.2.4.0
Owner
No description provided.
Replace dead BoneCache with a working EditBoneIndex
All checks were successful
Blender Tests / blender (https://download.blender.org/release/Blender5.2/, 5.2) (push) Successful in 2m1s
Blender Tests / blender (https://download.blender.org/release/Blender5.1/, 5.1) (push) Successful in 2m9s
Static Tests / static (push) Successful in 22s
Blender Tests / blender (true, alpha, 5.3) (push) Successful in 1m58s
5cb62742d9
The old class indexed data.bones by name in OBJECT mode and was never
called; the rename passes still scanned every edit bone per candidate.
Indexing those three scans cuts ~26% off a 1000-bone fix, output identical.
Both merge passes scanned every vertex group per candidate name, and most
lookups miss, so each one walked the whole collection. Groups are added and
removed mid-pass, so the index rebuilds lazily and every mutation site
invalidates it. 1019-bone fix: 1.19s to 0.56s, weights bit-identical.
Change Repo URL
All checks were successful
Blender Tests / blender (https://download.blender.org/release/Blender5.2/, 5.2) (push) Successful in 2m6s
Blender Tests / blender (https://download.blender.org/release/Blender5.1/, 5.1) (push) Successful in 2m10s
Static Tests / static (push) Successful in 20s
Blender Tests / blender (true, alpha, 5.3) (push) Successful in 2m0s
Blender Tests / blender (https://download.blender.org/release/Blender5.2/, 5.2) (pull_request) Successful in 2m2s
Blender Tests / blender (https://download.blender.org/release/Blender5.1/, 5.1) (pull_request) Successful in 2m9s
Static Tests / static (pull_request) Successful in 21s
Blender Tests / blender (true, alpha, 5.3) (pull_request) Successful in 1m59s
aece922875
All checks were successful
Blender Tests / blender (https://download.blender.org/release/Blender5.2/, 5.2) (push) Successful in 2m6s
Blender Tests / blender (https://download.blender.org/release/Blender5.1/, 5.1) (push) Successful in 2m10s
Static Tests / static (push) Successful in 20s
Blender Tests / blender (true, alpha, 5.3) (push) Successful in 2m0s
Blender Tests / blender (https://download.blender.org/release/Blender5.2/, 5.2) (pull_request) Successful in 2m2s
Blender Tests / blender (https://download.blender.org/release/Blender5.1/, 5.1) (pull_request) Successful in 2m9s
Static Tests / static (pull_request) Successful in 21s
Blender Tests / blender (true, alpha, 5.3) (pull_request) Successful in 1m59s
This pull request has changes conflicting with the target branch.
  • resources/translations/en_US.json
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin main:main
git switch main

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch 5.2.4.0
git merge --no-ff main
git switch main
git rebase 5.2.4.0
git switch 5.2.4.0
git merge --ff-only main
git switch main
git rebase 5.2.4.0
git switch 5.2.4.0
git merge --no-ff main
git switch 5.2.4.0
git merge --squash main
git switch 5.2.4.0
git merge --ff-only main
git switch 5.2.4.0
git merge main
git push origin 5.2.4.0
Sign in to join this conversation.
No description provided.