blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 761 Projects 19 Wiki Activity

Add poll messages for marker operators 

A number of operators were missing poll messages when disabled.

These are the following new error messages:

1. "No markers are selected"
2. "Markers are locked"

Reviewed By: sybren

Differential Revision: https://developer.blender.org/D16403
This commit is contained in:
Colin Basnett 2022-11-11 11:13:00 -08:00
parent 5671e7a92c
commit 1fdaf748bf
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source/blender/editors/animation/anim_markers.c
View File

@ -663,11 +663,16 @@ static bool ed_markers_poll_selected_markers(bContext *C)
ListBase *markers = ED_context_get_markers(C);
if (!ED_operator_markers_region_active(C)) {
return 0;
return false;
}
/* check if some marker is selected */
return ED_markers_get_first_selected(markers) != NULL;
if (ED_markers_get_first_selected(markers) == NULL) {
CTX_wm_operator_poll_msg_set(C, "No markers are selected");
return false;
}
return true;
}
static bool ed_markers_poll_selected_no_locked_markers(bContext *C)
@ -675,12 +680,22 @@ static bool ed_markers_poll_selected_no_locked_markers(bContext *C)
ListBase *markers = ED_context_get_markers(C);
ToolSettings *ts = CTX_data_tool_settings(C);
if (ts->lock_markers || !ED_operator_markers_region_active(C)) {
return 0;
if (!ED_operator_markers_region_active(C)) {
return false;
}
if (ts->lock_markers) {
CTX_wm_operator_poll_msg_set(C, "Markers are locked");
return false;
}
/* check if some marker is selected */
return ED_markers_get_first_selected(markers) != NULL;
if (ED_markers_get_first_selected(markers) == NULL) {
CTX_wm_operator_poll_msg_set(C, "No markers are selected");
return false;
}
return true;
}
/* special poll() which checks if there are any markers at all first */