Merge branch 'master' into soc-2013-rigid_body_simsoc-2013-rigid_body_sim

Conflicts:
	intern/rigidbody/CMakeLists.txt
	release/datafiles/splash.png
	source/blender/editors/space_view3d/drawobject.c
	source/blender/makesdna/DNA_view3d_types.h

1 files changed, 8 insertions, 1 deletions

diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c
index 84c6329db53..4a4754e8adc 100644
--- a/source/blender/editors/space_sequencer/space_sequencer.c
+++ b/source/blender/editors/space_sequencer/space_sequencer.c
@@ -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 @@ static void sequencer_preview_area_draw(const bContext *C, ARegion *ar)
 	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 @@ static void sequencer_preview_area_draw(const bContext *C, ARegion *ar)
 			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)