Animation: NLA Vertical Reorder #107990

Merged
Nate Rupsis merged 35 commits from nrupsis/blender:NLA-vertical-shuffle-core into main 2023-06-20 17:10:15 +02:00

35 Commits

Author SHA1 Message Date
9ed03a6699 adding in message when trying to drop NLA strip on a locked track 2023-06-20 09:32:07 -04:00
ac611e519d Merge branch 'main' into NLA-vertical-shuffle-core 2023-06-19 19:56:29 -04:00
86f304d0f3 Merge branch 'main' into NLA-vertical-shuffle-core 2023-06-11 11:21:28 -04:00
8b8c8de203 fixing comment 2023-05-23 17:04:12 -04:00
fe8d145684 resolve merge conflict 2023-05-23 17:02:34 -04:00
c6497c55dd fix NLA track juming to index 0 on invalid transform. PR comments 2023-05-23 16:52:03 -04:00
4375461b98 Merge branch 'main' into NLA-vertical-shuffle-core 2023-05-23 11:32:06 -04:00
d5d6047bd5 Refactor: split up pointer dereferencing 2023-05-17 11:34:44 +02:00
c7ee156aa3 Refactor: use LISTBASE_FOREACH 2023-05-17 11:34:40 +02:00
49c313ebee remove lower auto expand
All checks were successful
buildbot/vexp-code-patch-coordinator Build done.
2023-05-16 18:16:20 -04:00
2d35560c9f fixing compiler warning
All checks were successful
buildbot/vexp-code-patch-coordinator Build done.
2023-05-16 17:36:38 -04:00
302d5bd1f2 cleanup
Some checks failed
buildbot/vexp-code-patch-coordinator Build done.
2023-05-16 16:57:51 -04:00
03d82ca6bd removing auto expand 2023-05-16 16:45:13 -04:00
e7b004bfee testing out keymap 2023-05-16 15:13:37 -04:00
b30517ab40 Merge branch 'main' into NLA-vertical-shuffle 2023-05-16 14:51:23 -04:00
4b34ec77af fix merge conflict
All checks were successful
buildbot/vexp-code-patch-coordinator Build done.
2023-05-02 13:43:11 -04:00
4116354bc9 Merge branch 'main' of https://projects.blender.org/blender/blender 2023-05-02 12:58:22 -04:00
0ef5f31d01 remain active on valid transform. Only auto expand on ctrl+drag 2023-05-02 12:24:30 -04:00
581e56bf2f Merge branch 'main' into NLA-vertical-shuffle 2023-04-25 15:55:17 -04:00
03b8484ac0 Merge branch 'main' of https://projects.blender.org/blender/blender 2023-04-25 15:39:14 -04:00
ffbc21b7b0 Merge branch 'main' of https://projects.blender.org/blender/blender 2023-04-25 13:55:56 -04:00
60194e0ad5 Merge branch 'main' of https://projects.blender.org/blender/blender 2023-04-20 10:55:30 -04:00
135c18e906 need to add unsafe, so it shuffles back
Some checks failed
buildbot/vexp-code-patch-coordinator Build done.
2023-04-20 01:12:15 -04:00
7e1e58f047 Merge branch 'main' of https://projects.blender.org/blender/blender 2023-04-18 19:27:36 -04:00
b2e12946a1 strip sometimes still disapears... 2023-04-18 19:27:05 -04:00
05ee563146 Merge branch 'main' into NLA-vertical-shuffle 2023-04-18 12:56:11 -04:00
996c76f5b6 Merge branch 'main' of https://projects.blender.org/blender/blender 2023-04-18 12:55:56 -04:00
b05fd22795 Merge branch 'main' of https://projects.blender.org/blender/blender 2023-04-17 13:39:03 -04:00
da512eec3e Merge branch 'main' of https://projects.blender.org/blender/blender
the commit.
2023-04-16 18:16:08 -04:00
029c21f470 Merge branch 'main' of https://projects.blender.org/blender/blender 2023-04-14 09:50:25 -07:00
765d9e7630 starting some refactroing 2023-04-06 09:17:45 -04:00
9bf94d879e Merge branch 'main' into NLA-vertical-shuffle 2023-04-04 18:26:57 -04:00
e13ed88c35 Merge branch 'main' of https://projects.blender.org/blender/blender 2023-04-04 16:34:49 -04:00
111a3c8d62 initial vertical shuffle code 2023-04-04 16:31:05 -04:00
574f15d1f5 Cleanup: Fix spelling for 'bone' 2023-04-03 15:53:58 -04:00