Fix: Set active keying set menu showing wrong label #116189

Christoph Lendenfeld · 2023-12-14T15:29:27+01:00

2023-12-14 15:29:27 +01:00

When opening the menu to set/change the
active keying set, the top entry would
show "Active Keying Set" (if there is one).
(Open the menu with Ctrl+Shift+Alt+I)

Clicking this option would unset the active keying set
though as pointed out by Nika Kutsniashvili in #115798: Anim: Add hotkey for keying set operators

This PR fixes it by splitting the function that dynamically generates the enum.
The core of the function has been extracted, and only the section
that creates the entry for "Active Keying Set" has been changed.

It now reads "Clear Active Keying Set"

Depends on: #116332

Before	After

When opening the menu to set/change the active keying set, the top entry would show "Active Keying Set" (if there is one). (Open the menu with Ctrl+Shift+Alt+I) Clicking this option would unset the active keying set though as pointed out by Nika Kutsniashvili in [#115798: Anim: Add hotkey for keying set operators](https://projects.blender.org/blender/blender/pulls/115798) This PR fixes it by splitting the function that dynamically generates the enum. The core of the function has been extracted, and only the section that creates the entry for "Active Keying Set" has been changed. It now reads "Clear Active Keying Set" Depends on: #116332 | Before | After | | - | - | | ![image](/attachments/5d563c22-226b-4d00-bfed-5d8bdb39d9f6) | ![image](/attachments/9491b67c-ea2c-4f4d-a252-ac9dd1e5b8c4) |

image.png

25 KiB

image.png

19 KiB

Christoph Lendenfeld added the

Module

Animation & Rigging

label 2023-12-14 15:29:27 +01:00

Christoph Lendenfeld added 1 commit 2023-12-14 15:29:36 +01:00

415d56a64e the fix

Nika Kutsniashvili commented

2023-12-14 15:33:39 +01:00

Wouldn't it be more comfortable if it was last? First one is easy to misclick, especially when you have custom keying sets right under there

Christoph Lendenfeld commented

2023-12-14 15:41:52 +01:00

Wouldn't it be more comfortable if it was last? First one is easy to misclick, especially when you have custom keying sets right under there

I kept it in the same place because it is consistent with the "apply keyingset" menu. Active keyingset is in the same spot.
We can move it, but I would make that a separate PR because it's not related to this fix.

> Wouldn't it be more comfortable if it was last? First one is easy to misclick, especially when you have custom keying sets right under there I kept it in the same place because it is consistent with the "apply keyingset" menu. Active keyingset is in the same spot. We can move it, but I would make that a separate PR because it's not related to this fix.

👍 1

Sybren A. Stüvel requested changes 2023-12-19 10:55:24 +01:00

Sybren A. Stüvel left a comment

I think the approach here is good, but I think it's clearer if this PR were to be split.

This PR fixes it by splitting the function that dynamically generates the enum.
The core of the function has been extracted, and only the section
that creates the entry for "Active Keying Set" has been changed.

If these two steps would be two commits, the functional changes will stand out much clearer.
And then I can review without requiring too much brain ;-)

I think the approach here is good, but I think it's clearer if this PR were to be split. > This PR fixes it by splitting the function that dynamically generates the enum. > The core of the function has been extracted, and only the section > that creates the entry for "Active Keying Set" has been changed. If these two steps would be two commits, the functional changes will stand out much clearer. And then I can review without requiring too much brain ;-)

👍 1

Christoph Lendenfeld referenced this pull request

2023-12-19 12:14:34 +01:00

Refactor: extract code from ANIM_keying_sets_enum_itemf #116332

Christoph Lendenfeld commented

2023-12-19 12:19:20 +01:00

Split off the code extraction: #116332: Refactor: extract code from ANIM_keying_sets_enum_itemf

Split off the code extraction: [#116332: Refactor: extract code from ANIM_keying_sets_enum_itemf](https://projects.blender.org/blender/blender/pulls/116332)

Christoph Lendenfeld referenced this issue from a commit

2023-12-21 16:15:51 +01:00

Refactor: extract code from ANIM_keying_sets_enum_itemf

Christoph Lendenfeld added 2 commits 2024-01-04 11:34:14 +01:00

cdb5fb0f3b Merge branch 'main' into fix_active_keying_set_label

62615cfbbe keying_set -> keyingset

Christoph Lendenfeld requested review from Sybren A. Stüvel 2024-01-04 11:35:05 +01:00

Christoph Lendenfeld commented

2024-01-04 11:35:27 +01:00

@dr.sybren now that the refactor PR has landed, this should be easier to review

Sybren A. Stüvel approved these changes 2024-01-04 16:15:23 +01:00

Sybren A. Stüvel left a comment