blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Revert "Fix T89560: Keymap editor no longer shows keying set dropdown" 

This reverts commit e55f4657f7.

It's not intended to support assigning shortcuts to this operator,
which could only work for built-in keying sets caused warnings to be
reported warnings when exporting key-maps.

Prefer D14289, preventing users running into this problem to begin with.
This commit is contained in:
Campbell Barton 2022-03-23 16:47:22 +11:00
parent d356edf420
commit 56dba4df3c
Notes: blender-bot 2023-02-14 03:52:45 +01:00 
Referenced by issue #89560, Insert key dropdown on keymap doesn't show keying sets anymore
1 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
source/blender/editors/animation/keyingsets.c
View File

@ -715,54 +715,55 @@ const EnumPropertyItem *ANIM_keying_sets_enum_itemf(bContext *C,
PropertyRNA *UNUSED(prop),
bool *r_free)
{
Scene *scene = CTX_data_scene(C);
KeyingSet *ks;
EnumPropertyItem *item = NULL, item_tmp = {0};
int totitem = 0;
int i = 0;
if (C != NULL) {
Scene *scene = CTX_data_scene(C);
/* active Keying Set
* - only include entry if it exists
*/
if (scene->active_keyingset) {
/* active Keying Set */
item_tmp.identifier = "__ACTIVE__";
item_tmp.name = "Active Keying Set";
item_tmp.value = i;
RNA_enum_item_add(&item, &totitem, &item_tmp);
if (C == NULL) {
return DummyRNA_DEFAULT_items;
}
/* separator */
RNA_enum_item_add_separator(&item, &totitem);
}
/* active Keying Set
* - only include entry if it exists
*/
if (scene->active_keyingset) {
/* active Keying Set */
item_tmp.identifier = "__ACTIVE__";
item_tmp.name = "Active Keying Set";
item_tmp.value = i;
RNA_enum_item_add(&item, &totitem, &item_tmp);
i++;
/* separator */
RNA_enum_item_add_separator(&item, &totitem);
}
/* user-defined Keying Sets
* - these are listed in the order in which they were defined for the active scene
*/
if (scene->keyingsets.first) {
for (ks = scene->keyingsets.first; ks; ks = ks->next, i++) {
if (ANIM_keyingset_context_ok_poll(C, ks)) {
item_tmp.identifier = ks->idname;
item_tmp.name = ks->name;
item_tmp.description = ks->description;
item_tmp.value = i;
RNA_enum_item_add(&item, &totitem, &item_tmp);
}
i++;
/* user-defined Keying Sets
* - these are listed in the order in which they were defined for the active scene
*/
if (scene->keyingsets.first) {
for (ks = scene->keyingsets.first; ks; ks = ks->next, i++) {
if (ANIM_keyingset_context_ok_poll(C, ks)) {
item_tmp.identifier = ks->idname;
item_tmp.name = ks->name;
item_tmp.description = ks->description;
item_tmp.value = i;
RNA_enum_item_add(&item, &totitem, &item_tmp);
}
/* separator */
RNA_enum_item_add_separator(&item, &totitem);
}
/* separator */
RNA_enum_item_add_separator(&item, &totitem);
}
/* builtin Keying Sets */
i = -1;
for (ks = builtin_keyingsets.first; ks; ks = ks->next, i--) {
/* Only show #KeyingSet if context is suitable or if there is no context which is needed
* to support key-bindings to be assigned since key bindings are not context aware. */
if ((C == NULL) || ANIM_keyingset_context_ok_poll(C, ks)) {
/* only show KeyingSet if context is suitable */
if (ANIM_keyingset_context_ok_poll(C, ks)) {
item_tmp.identifier = ks->idname;
item_tmp.name = ks->name;
item_tmp.description = ks->description;