WIP: initial vertical shuffle code #106571

Closed

Nate Rupsis wants to merge 20 commits from nrupsis/blender:NLA-vertical-shuffle into main

pull from: nrupsis/blender:NLA-vertical-shuffle

merge into: blender:main

blender:main

blender:brush-assets-project

blender:universal-scene-description

blender:fix-121021

blender:blender-v4.1-release

blender:blender-v3.3-release

blender:blender-v3.6-release

blender:blender-v3.6-temp_wmoss_animrig_public

blender:temp-sculpt-dyntopo

blender:gpencil-next

blender:anim/animation-id-113594

blender:blender-v4.0-release

blender:blender-projects-basics

blender:bridge-curves

blender:sculpt-blender

blender:asset-browser-frontend-split

blender:asset-shelf

blender:tmp-usd-python-mtl

blender:tmp-usd-3.6

blender:blender-v3.5-release

blender:blender-v2.93-release

blender:realtime-clock

blender:sculpt-dev

blender:bevelv2

blender:xr-dev

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.

Conversation 4 Commits 20 Files Changed 2 +328 -40

20 Commits

Author	SHA1	Message	Date
Nate Rupsis	4b34ec77af	fix merge conflict	2023-05-02 13:43:11 -04:00
Nate Rupsis	4116354bc9	Merge branch 'main' of https://projects.blender.org/blender/blender	2023-05-02 12:58:22 -04:00
Nate Rupsis	0ef5f31d01	remain active on valid transform. Only auto expand on ctrl+drag	2023-05-02 12:24:30 -04:00
Nate Rupsis	581e56bf2f	Merge branch 'main' into NLA-vertical-shuffle	2023-04-25 15:55:17 -04:00
Nate Rupsis	03b8484ac0	Merge branch 'main' of https://projects.blender.org/blender/blender	2023-04-25 15:39:14 -04:00
Nate Rupsis	ffbc21b7b0	Merge branch 'main' of https://projects.blender.org/blender/blender	2023-04-25 13:55:56 -04:00
Nate Rupsis	60194e0ad5	Merge branch 'main' of https://projects.blender.org/blender/blender	2023-04-20 10:55:30 -04:00
Nate Rupsis	135c18e906	need to add unsafe, so it shuffles back	2023-04-20 01:12:15 -04:00
Nate Rupsis	7e1e58f047	Merge branch 'main' of https://projects.blender.org/blender/blender	2023-04-18 19:27:36 -04:00
Nate Rupsis	b2e12946a1	strip sometimes still disapears...	2023-04-18 19:27:05 -04:00
Nate Rupsis	05ee563146	Merge branch 'main' into NLA-vertical-shuffle	2023-04-18 12:56:11 -04:00
Nate Rupsis	996c76f5b6	Merge branch 'main' of https://projects.blender.org/blender/blender	2023-04-18 12:55:56 -04:00
Nate Rupsis	b05fd22795	Merge branch 'main' of https://projects.blender.org/blender/blender	2023-04-17 13:39:03 -04:00
Nate Rupsis	da512eec3e	Merge branch 'main' of https://projects.blender.org/blender/blender ... the commit.	2023-04-16 18:16:08 -04:00
Nate Rupsis	029c21f470	Merge branch 'main' of https://projects.blender.org/blender/blender	2023-04-14 09:50:25 -07:00
Nate Rupsis	765d9e7630	starting some refactroing	2023-04-06 09:17:45 -04:00
Nate Rupsis	9bf94d879e	Merge branch 'main' into NLA-vertical-shuffle	2023-04-04 18:26:57 -04:00
Nate Rupsis	e13ed88c35	Merge branch 'main' of https://projects.blender.org/blender/blender	2023-04-04 16:34:49 -04:00
Nate Rupsis	111a3c8d62	initial vertical shuffle code	2023-04-04 16:31:05 -04:00
Nate Rupsis	574f15d1f5	Cleanup: Fix spelling for 'bone'	2023-04-03 15:53:58 -04:00