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_intern.h | |
| 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_intern.h')
| -rw-r--r-- | source/blender/editors/interface/interface_intern.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h index 942f19eb4e9..5573d9b2edb 100644 --- a/source/blender/editors/interface/interface_intern.h +++ b/source/blender/editors/interface/interface_intern.h @@ -1014,7 +1014,11 @@ typedef struct uiRNACollectionSearch { PointerRNA search_ptr; PropertyRNA *search_prop; - bool *but_changed; /* pointer to uiBut.changed */ + uiBut *search_but; + /* Let UI_butstore_ API update search_but pointer above over redraws. */ + uiButStore *butstore; + /* Block has to be stored for freeing butstore (uiBut.block doesn't work with undo). */ + uiBlock *butstore_block; } uiRNACollectionSearch; void ui_rna_collection_search_cb(const struct bContext *C, void *arg, |