[Bf-blender-cvs] [a451d4abbc1] master: Fix T59644: FPS meter not showing in VSE

[Richard Antalik]

Commit: a451d4abbc1c9e1158338da3806f30ae0d15fd7b
Author: Richard Antalik
Date:   Fri Dec 21 16:27:08 2018 -0800
Branches: master
https://developer.blender.org/rBa451d4abbc1c9e1158338da3806f30ae0d15fd7b

Fix T59644: FPS meter not showing in VSE

Issue caused probably by typo

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

M	release/scripts/addons
M	release/scripts/addons_contrib
M	source/blender/editors/space_sequencer/space_sequencer.c
M	source/tools

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

diff --git a/release/scripts/addons b/release/scripts/addons
index 0457976a872..e3c9be92624 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 0457976a872000993202763abe7503c76b461122
+Subproject commit e3c9be92624d93ba3eb78731887455fbf41040d6
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index ceb054a0f92..4c5ddaeb2d1 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit ceb054a0f923fa49cd9e8ef20322261a26160151
+Subproject commit 4c5ddaeb2d1953ea9db10b2fdde2f93e19b1d6d7
diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c
index 4e10ed62366..3444ad7823e 100644
--- a/source/blender/editors/space_sequencer/space_sequencer.c
+++ b/source/blender/editors/space_sequencer/space_sequencer.c
@@ -654,7 +654,7 @@ static void sequencer_preview_region_draw(const bContext *C, ARegion *ar)
 		rcti rect;
 		ED_region_visible_rect(ar, &rect);
 		int xoffset = rect.xmin + U.widget_unit;
-		int yoffset = rect.xmax;
+		int yoffset = rect.ymax;
 		ED_scene_draw_fps(scene, xoffset, &yoffset);
 	}
 }
diff --git a/source/tools b/source/tools
index 2278dd8d6ae..279c373280e 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 2278dd8d6aea4d56632dee37196a5e341ce99283
+Subproject commit 279c373280e54388ede50abea9d11d5cdaa1d567