Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2018-09-17 11:22:00 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2018-09-17 11:22:00 +0300
commit640fcc25a4a227c816cf4523e467f03cbafab9e9 (patch)
tree0eadfe3ae175e1bd5f053562ca37330cd809d13b /source
parent66ad9ef2ce3f646ad1cf177198a47365069f742a (diff)
Fix T56811: Do not show cancel button for jobs when UI is locked.
Since that button is then totally useless and unusable...
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/interface/interface_templates.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index d9be0abfb78..be489072439 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -3876,9 +3876,11 @@ void uiTemplateRunningJobs(uiLayout *layout, bContext *C)
UI_but_func_tooltip_set(but_progress, progress_tooltip_func, tip_arg);
}
- uiDefIconTextBut(block, UI_BTYPE_BUT, handle_event, ICON_PANEL_CLOSE,
- "", 0, 0, UI_UNIT_X, UI_UNIT_Y,
- NULL, 0.0f, 0.0f, 0, 0, TIP_("Stop this job"));
+ if (!wm->is_interface_locked) {
+ uiDefIconTextBut(block, UI_BTYPE_BUT, handle_event, ICON_PANEL_CLOSE,
+ "", 0, 0, UI_UNIT_X, UI_UNIT_Y,
+ NULL, 0.0f, 0.0f, 0, 0, TIP_("Stop this job"));
+ }
}
if (screen->animtimer)