[Bf-blender-cvs] [25cb12dc71e] master: UI: Show animation cancel button in all status-bars

Julian Eisel noreply at git.blender.org
Thu Jan 16 11:58:45 CET 2020


Commit: 25cb12dc71e83a331d31568f33ecd6315c5605fa
Author: Julian Eisel
Date:   Thu Jan 16 11:53:45 2020 +0100
Branches: master
https://developer.blender.org/rB25cb12dc71e83a331d31568f33ecd6315c5605fa

UI: Show animation cancel button in all status-bars

Previously the button would only show up in the status-bar located in
the same window that had the screen with the animation timer.
I don't see a reason not to show the button in all status-bars instead,
other animation feedback is also displayed in all windows.

Fixes T72194.

===================================================================

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 0880da91005..f0e15e16e91 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -6863,7 +6863,6 @@ static char *progress_tooltip_func(bContext *UNUSED(C), void *argN, const char *
 
 void uiTemplateRunningJobs(uiLayout *layout, bContext *C)
 {
-  bScreen *screen = CTX_wm_screen(C);
   wmWindowManager *wm = CTX_wm_manager(C);
   ScrArea *sa = CTX_wm_area(C);
   uiBlock *block;
@@ -7045,7 +7044,7 @@ void uiTemplateRunningJobs(uiLayout *layout, bContext *C)
     }
   }
 
-  if (screen->animtimer) {
+  if (ED_screen_animation_playing(wm)) {
     uiDefIconTextBut(block,
                      UI_BTYPE_BUT,
                      B_STOPANIM,



More information about the Bf-blender-cvs mailing list