Merge branch 'blender-v3.1-release'
This commit is contained in:
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user