diff options
| author | Campbell Barton <campbell@blender.org> | 2022-02-22 08:43:23 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-02-22 08:43:23 +0300 |
| commit | 2cd33955beb3661b81ae14408d366e1152cd0c63 (patch) | |
| tree | 69bada1a3b92d30beaef97aa3a0416a55cbfa134 /source/blender/editors/interface/interface_handlers.c | |
| parent | 2234bfbcdb14299aa2ed28ed3ee6682c6d9a7a0c (diff) | |
| parent | c5b66560de75a54b5c6920fb675c0d804caeb724 (diff) | |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source/blender/editors/interface/interface_handlers.c')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index bbb6bfabdd1..9dcee73f6bb 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -8793,7 +8793,7 @@ uiBut *UI_context_active_but_prop_get(const bContext *C, return activebut; } -void UI_context_active_but_prop_handle(bContext *C) +void UI_context_active_but_prop_handle(bContext *C, const bool handle_undo) { uiBut *activebut = ui_context_rna_button_active(C); if (activebut) { @@ -8804,6 +8804,11 @@ void UI_context_active_but_prop_handle(bContext *C) if (block->handle_func) { block->handle_func(C, block->handle_func_arg, activebut->retval); } + if (handle_undo) { + /* Update the button so the undo text uses the correct value. */ + ui_but_update(activebut); + ui_apply_but_undo(activebut); + } } } |