Fix T58683: Reload Scripts breaks toolbar button formatting.

Assuming it's actually necessary to do this check very efficiently,
replace the hack based on caching a pointer, with a different one
that caches the string comparison result in the operator object.
This commit is contained in:
2019-09-29 09:20:56 +03:00
parent 44d042094e
commit ba90d2efa5
3 changed files with 8 additions and 11 deletions

View File

@@ -139,17 +139,7 @@ bool ui_but_has_array_value(const uiBut *but)
bool UI_but_is_tool(const uiBut *but)
{
/* very evil! */
if (but->optype != NULL) {
static wmOperatorType *ot = NULL;
if (ot == NULL) {
ot = WM_operatortype_find("WM_OT_tool_set_by_id", false);
}
if (but->optype == ot) {
return true;
}
}
return false;
return but->optype && but->optype->is_tool_button;
}
bool UI_but_has_tooltip_label(const uiBut *but)