Commit: ae0612c2acbea8073f6cea98d1bae507fdcb455d
Author: Antony Riakiotakis
Date: Fri Jun 5 16:47:01 2015 +0200
Branches: gooseberry
https://developer.blender.org/rBae0612c2acbea8073f6cea98d1bae507fdcb455d
Do not show fps while scrubbing.
===================================================================
M source/blender/editors/include/ED_screen.h
M source/blender/editors/screen/screen_ops.c
M source/blender/editors/space_view3d/view3d_draw.c
===================================================================
diff --git a/source/blender/editors/include/ED_screen.h
b/source/blender/editors/include/ED_screen.h
index 1b4f3a1..aa8e211 100644
--- a/source/blender/editors/include/ED_screen.h
+++ b/source/blender/editors/include/ED_screen.h
@@ -127,6 +127,7 @@ void ED_update_for_newframe(struct Main *bmain, struct
Scene *scene, int mute
void ED_refresh_viewport_fps(struct bContext *C);
int ED_screen_animation_play(struct bContext *C, int sync, int
mode);
bScreen *ED_screen_animation_playing(const struct wmWindowManager *wm);
+bScreen *ED_screen_animation_no_scrub(const struct wmWindowManager *wm);
/* screen keymaps */
void ED_operatortypes_screen(void);
diff --git a/source/blender/editors/screen/screen_ops.c
b/source/blender/editors/screen/screen_ops.c
index 89098f3..1c6d46d 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -3525,6 +3525,20 @@ bScreen *ED_screen_animation_playing(const
wmWindowManager *wm)
return NULL;
}
+bScreen *ED_screen_animation_no_scrub(const wmWindowManager *wm)
+{
+ wmWindow *win;
+
+ for (win = wm->windows.first; win; win = win->next) {
+ if (win->screen->animtimer) {
+ return win->screen;
+ }
+ }
+
+ return NULL;
+}
+
+
/* toggle operator */
int ED_screen_animation_play(bContext *C, int sync, int mode)
{
diff --git a/source/blender/editors/space_view3d/view3d_draw.c
b/source/blender/editors/space_view3d/view3d_draw.c
index 59632d1..5ccb16e 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -4036,7 +4036,7 @@ static void view3d_main_area_draw_info(const bContext *C,
Scene *scene,
if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
wmWindowManager *wm = CTX_wm_manager(C);
- if ((U.uiflag & USER_SHOW_FPS) &&
ED_screen_animation_playing(wm)) {
+ if ((U.uiflag & USER_SHOW_FPS) &&
ED_screen_animation_no_scrub(wm)) {
ED_scene_draw_fps(scene, &rect);
}
else if (U.uiflag & USER_SHOW_VIEWPORTNAME) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
