[Bf-blender-cvs] [6b06440ed86] master: Fix 'static override' message showing in ID template tooltip.
Bastien Montagne
noreply at git.blender.org
Thu Apr 11 18:02:52 CEST 2019
Commit: 6b06440ed867189262034c26b483474fae670e60
Author: Bastien Montagne
Date: Thu Apr 11 17:46:10 2019 +0200
Branches: master
https://developer.blender.org/rB6b06440ed867189262034c26b483474fae670e60
Fix 'static override' message showing in ID template tooltip.
We only want to show that when library overrides are enabled.
===================================================================
M source/blender/editors/interface/interface_templates.c
===================================================================
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 0bb1497a74e..1591244c9b5 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -713,8 +713,10 @@ static void template_ID(
but = uiDefIconBut(
block, UI_BTYPE_BUT, 0, ICON_LIBRARY_DATA_DIRECT, 0, 0, UI_UNIT_X, UI_UNIT_Y,
NULL, 0, 0, 0, 0,
- TIP_("Direct linked library data-block, click to make local, "
- "Shift + Click to create a static override"));
+ BKE_override_static_is_enabled() ?
+ TIP_("Direct linked library data-block, click to make local, "
+ "Shift + Click to create a static override") :
+ TIP_("Direct linked library data-block, click to make local"));
if (disabled) {
UI_but_flag_enable(but, UI_BUT_DISABLED);
}
More information about the Bf-blender-cvs
mailing list