diff options
| author | Julian Eisel <julian@blender.org> | 2020-04-09 00:08:32 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-04-09 00:23:44 +0300 |
| commit | 1239cab11ff97faec708c7a4cf11007ac2b37108 (patch) | |
| tree | 85f4513083427789d856519f8b23bcdaaa9a5fec /source/blender/editors/interface/interface_utils.c | |
| parent | 74fa8787d8640c0856f3192898b8ebeaa0d639ac (diff) | |
Fix T75203: Crash when changing active keying set
When updating the active button, the search data wasn't updated, so it
kept using the old pointers. A check in `ui_rna_collection_search_cb()`
relied on this incorrect behavior so I had to fix that too. Note that
the previous commit was also needed for the second fix to work.
Caused by c46dcdf8871e.
Diffstat (limited to 'source/blender/editors/interface/interface_utils.c')
| -rw-r--r-- | source/blender/editors/interface/interface_utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_utils.c b/source/blender/editors/interface/interface_utils.c index 67cb91a3cc4..2d687781b61 100644 --- a/source/blender/editors/interface/interface_utils.c +++ b/source/blender/editors/interface/interface_utils.c @@ -399,7 +399,7 @@ void ui_rna_collection_search_cb(const struct bContext *C, int i = 0, iconid = 0, flag = RNA_property_flag(data->target_prop); ListBase *items_list = MEM_callocN(sizeof(ListBase), "items_list"); CollItemSearch *cis; - const bool skip_filter = (data->but_changed && !(*data->but_changed)); + const bool skip_filter = data->search_but && !data->search_but->changed; /* build a temporary list of relevant items first */ RNA_PROP_BEGIN (&data->search_ptr, itemptr, data->search_prop) { |