[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60837] trunk/blender/source/blender/ editors: Pampa Project request: FPS in sequencer editor

[Sergey Sharybin]

Revision: 60837
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60837
Author:   nazgul
Date:     2013-10-17 21:17:33 +0000 (Thu, 17 Oct 2013)
Log Message:
-----------
Pampa Project request: FPS in sequencer editor

perhaps ED_scene_draw_fps is actually better to be placed
to a better place, but consider this is good for now.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/include/ED_view3d.h
    trunk/blender/source/blender/editors/space_sequencer/space_sequencer.c
    trunk/blender/source/blender/editors/space_view3d/view3d_draw.c

Modified: trunk/blender/source/blender/editors/include/ED_view3d.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_view3d.h    2013-10-17 
20:18:48 UTC (rev 60836)
+++ trunk/blender/source/blender/editors/include/ED_view3d.h    2013-10-17 
21:17:33 UTC (rev 60837)
@@ -328,6 +328,8 @@
 float ED_scene_grid_scale(struct Scene *scene, const char **grid_unit);
 float ED_view3d_grid_scale(struct Scene *scene, struct View3D *v3d, const char 
**grid_unit);
 
+void ED_scene_draw_fps(struct Scene *scene, struct rcti *rect);
+
 /* view matrix properties utilities */
 /* unused */
 #if 0

Modified: trunk/blender/source/blender/editors/space_sequencer/space_sequencer.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/space_sequencer.c      
2013-10-17 20:18:48 UTC (rev 60836)
+++ trunk/blender/source/blender/editors/space_sequencer/space_sequencer.c      
2013-10-17 21:17:33 UTC (rev 60837)
@@ -54,6 +54,7 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
+#include "UI_interface.h"
 #include "UI_resources.h"
 #include "UI_view2d.h"
 
@@ -534,8 +535,9 @@
        ScrArea *sa = CTX_wm_area(C);
        SpaceSeq *sseq = sa->spacedata.first;
        Scene *scene = CTX_data_scene(C);
+       wmWindowManager *wm = CTX_wm_manager(C);
        int show_split = scene->ed && scene->ed->over_flag & 
SEQ_EDIT_OVERLAY_SHOW && sseq->mainb == SEQ_DRAW_IMG_IMBUF;
-       
+
        /* XXX temp fix for wrong setting in sseq->mainb */
        if (sseq->mainb == SEQ_DRAW_SEQUENCE) sseq->mainb = SEQ_DRAW_IMG_IMBUF;
 
@@ -554,6 +556,11 @@
                        draw_image_seq(C, scene, ar, sseq, scene->r.cfra, 
over_cfra - scene->r.cfra, TRUE);
        }
 
+       if ((U.uiflag & USER_SHOW_FPS) && ED_screen_animation_playing(wm)) {
+               rcti rect;
+               ED_region_visible_rect(ar, &rect);
+               ED_scene_draw_fps(scene, &rect);
+       }
 }
 
 static void sequencer_preview_area_listener(bScreen *UNUSED(sc), ScrArea 
*UNUSED(sa), ARegion *ar, wmNotifier *wmn)

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c     
2013-10-17 20:18:48 UTC (rev 60836)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c     
2013-10-17 21:17:33 UTC (rev 60837)
@@ -2857,7 +2857,7 @@
 /* NOTE: the info that this uses is updated in ED_refresh_viewport_fps(), 
  * which currently gets called during SCREEN_OT_animation_step.
  */
-static void draw_viewport_fps(Scene *scene, rcti *rect)
+void ED_scene_draw_fps(Scene *scene, rcti *rect)
 {
        ScreenFrameRateInfo *fpsi = scene->fps_info;
        float fps;
@@ -3454,7 +3454,7 @@
 
        if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
                if ((U.uiflag & USER_SHOW_FPS) && 
ED_screen_animation_playing(wm)) {
-                       draw_viewport_fps(scene, &rect);
+                       ED_scene_draw_fps(scene, &rect);
                }
                else if (U.uiflag & USER_SHOW_VIEWPORTNAME) {
                        draw_viewport_name(ar, v3d, &rect);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs