Commit: 3e625a7a065592c090e64a2995e90b08bfb53221
Author: Campbell Barton
Date: Thu Nov 22 12:18:23 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB3e625a7a065592c090e64a2995e90b08bfb53221
UI: hide shortcut from gizmo tip when none found
===================================================================
M source/blender/editors/interface/interface_region_tooltip.c
===================================================================
diff --git a/source/blender/editors/interface/interface_region_tooltip.c
b/source/blender/editors/interface/interface_region_tooltip.c
index 5782bb466f5..b8cbf7950b7 100644
--- a/source/blender/editors/interface/interface_region_tooltip.c
+++ b/source/blender/editors/interface/interface_region_tooltip.c
@@ -897,22 +897,20 @@ static uiTooltipData *ui_tooltip_data_from_gizmo(bContext
*C, wmGizmo *gz)
/* Shortcut */
{
- bool found = false;
IDProperty *prop = gzop->ptr.data;
char buf[128];
if (WM_key_event_operator_string(
C, gzop->type->idname,
WM_OP_INVOKE_DEFAULT, prop, true,
buf, ARRAY_SIZE(buf)))
{
- found = true;
+ uiTooltipField *field =
text_field_add(
+ data,
&(uiTooltipFormat){
+ .style =
UI_TIP_STYLE_NORMAL,
+ .color_id =
UI_TIP_LC_VALUE,
+ .is_pad = true,
+ });
+ field->text =
BLI_sprintfN(TIP_("Shortcut: %s"), buf);
}
- uiTooltipField *field = text_field_add(
- data, &(uiTooltipFormat){
- .style =
UI_TIP_STYLE_NORMAL,
- .color_id = UI_TIP_LC_VALUE,
- .is_pad = true,
- });
- field->text =
BLI_sprintfN(TIP_("Shortcut: %s"), found ? buf : "None");
}
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
