griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: clarify ED_undo_operator_repeat return value

Browse Source 
This returned a 0/1 using a function signature typically used for
operator exec. Avoid confusion by returning a bool.
This commit is contained in:
Campbell Barton
2025-03-20 16:00:51 +11:00
parent e4ca31f6dd
commit 0dce94c20b
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/include/ED_undo.hh
View File

@@ -48,8 +48,10 @@ void ED_OT_undo_history(wmOperatorType *ot);
/**
* UI callbacks should call this rather than calling WM_operator_repeat() themselves.
*
* \return true when repeat succeeded.
*/
int ED_undo_operator_repeat(bContext *C, wmOperator *op);
bool ED_undo_operator_repeat(bContext *C, wmOperator *op);
/**
* Convenience since UI callbacks use this mostly.
*/

11
source/blender/editors/undo/ed_undo.cc
View File

@@ -501,8 +501,7 @@ static int ed_redo_exec(bContext *C, wmOperator *op)
static int ed_undo_redo_exec(bContext *C, wmOperator * /*op*/)
{
wmOperator *last_op = WM_operator_last_redo(C);
int ret = ED_undo_operator_repeat(C, last_op);
ret = ret ? OPERATOR_FINISHED : OPERATOR_CANCELLED;
const int ret = ED_undo_operator_repeat(C, last_op) ? OPERATOR_FINISHED : OPERATOR_CANCELLED;
if (ret & OPERATOR_FINISHED) {
/* Keep button under the cursor active. */
WM_event_add_mousemove(CTX_wm_window(C));
@@ -624,9 +623,9 @@ void ED_OT_undo_redo(wmOperatorType *ot)
/** \name Operator Repeat
* \{ */
int ED_undo_operator_repeat(bContext *C, wmOperator *op)
bool ED_undo_operator_repeat(bContext *C, wmOperator *op)
{
int ret = 0;
bool success = false;
if (op) {
CLOG_INFO(&LOG, 1, "idname='%s'", op->type->idname);
@@ -684,7 +683,7 @@ int ED_undo_operator_repeat(bContext *C, wmOperator *op)
ED_undo_redo(C);
}
else {
ret = 1;
success = true;
}
}
else {
@@ -700,7 +699,7 @@ int ED_undo_operator_repeat(bContext *C, wmOperator *op)
CLOG_WARN(&LOG, "called with nullptr 'op'");
}
return ret;
return success;
}
void ED_undo_operator_repeat_cb(bContext *C, void *arg_op, void * /*arg_unused*/)