Anim: Baklava, add Animation data-block to anim filtering code #120654

Sybren A. Stüvel · 2024-04-15T11:48:24+02:00

Sybren A. Stüvel commented

2024-04-15 11:48:24 +02:00

Add minimal support for the Animation data-block to the anim filtering code. This means:

F-Curves in the Animation data-block are shown in the Dope Sheet and Graph Editor.
The Animation is shown underneath each animated data-block, just like an Action would be.
Contrary to Actions, the expanded/collapsed state is stored on id->adt and not on Animation. Because an Animation is intended to be used by multiple data-blocks, they each should have their own flag for this.
In the filtering code, this PR adds the 'fillanim' channel type. This is simply mimicking the name from the Action's 'fillact' type.

Limitations:

Deleting of F-Curves is explicitly blocked, as that'll be introduced in a later PR. The block prevents Blender from crashing.
The Dope Sheet doesn't have an Animation mode yet, that'll be for a later PR too.

Add minimal support for the `Animation` data-block to the anim filtering code. This means: - F-Curves in the `Animation` data-block are shown in the Dope Sheet and Graph Editor. - The `Animation` is shown underneath each animated data-block, just like an `Action` would be. - Contrary to Actions, the expanded/collapsed state is stored on `id->adt` and not on `Animation`. Because an `Animation` is intended to be used by multiple data-blocks, they each should have their own flag for this. - In the filtering code, this PR adds the 'fillanim' channel type. This is simply mimicking the name from the Action's 'fillact' type. Limitations: - Deleting of F-Curves is explicitly blocked, as that'll be introduced in a later PR. The block prevents Blender from crashing. - The Dope Sheet doesn't have an Animation mode yet, that'll be for a later PR too.

Sybren A. Stüvel added 4 commits 2024-04-15 11:48:30 +02:00

7632b4f04e Anim: add Animation data-block to filtering code

It seems to be working like this, but more testing is necessary.

334aa81d29 Remove flags from Animation

b9a63ac070 Feedback Nathan

d393c87f1b Avoid crashing when trying to delete an FCurve

Sybren A. Stüvel added the

Module

Animation & Rigging

label 2024-04-15 11:48:44 +02:00

Sybren A. Stüvel requested review from Nathan Vegdahl 2024-04-18 11:46:27 +02:00

Sybren A. Stüvel requested review from Christoph Lendenfeld 2024-04-18 11:46:27 +02:00

Christoph Lendenfeld approved these changes 2024-04-18 12:24:52 +02:00

Christoph Lendenfeld left a comment

some of the changes have already landed in the refactor PR, right?

other than that, lgtm

some of the changes have already landed in the refactor PR, right? other than that, lgtm

Sybren A. Stüvel added 1 commit 2024-04-18 12:30:48 +02:00

8c2afe0b74 Merge remote-tracking branch 'origin/main' into pr/baklava-animation-filtering

# Conflicts:
#	source/blender/editors/animation/anim_filter.cc
#	source/blender/editors/include/ED_keyframes_draw.hh

Sybren A. Stüvel added 1 commit 2024-04-18 12:33:25 +02:00

44fb691747 Change macro `ANIMDATA_HAS_KEYS(id)` to `ANIMDATA_HAS_ACTION(id)`

The new name matches what it already was checking for.

Sybren A. Stüvel commented

2024-04-18 12:34:24 +02:00

Thanks for the review. I just merged with origin/main, so if there were any overlaps, they should be gone now.

Thanks for the review. I just merged with `origin/main`, so if there were any overlaps, they should be gone now.

Nathan Vegdahl approved these changes 2024-04-18 14:50:00 +02:00

Nathan Vegdahl left a comment

Since I looked at this already when it was WIP, I did a more cursory review this time, trying to focus on any changes. Looks good to me. I appreciate the shift to storing the expanded flag in the animdata.

Sybren A. Stüvel added 1 commit 2024-04-19 17:22:17 +02:00