[Bf-blender-cvs] [47f8459ead0] master: Fix T51388: Mask moves when zoom is changed in the movie clip editor

[Sergey Sharybin]

Commit: 47f8459ead00929eb3862aa66eb9c04b805d4a3f
Author: Sergey Sharybin
Date:   Wed May 17 14:50:32 2017 +0200
Branches: master
https://developer.blender.org/rB47f8459ead00929eb3862aa66eb9c04b805d4a3f

Fix T51388: Mask moves when zoom is changed in the movie clip editor

Incorrect matrix space for stabilization.

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

M	source/blender/editors/mask/mask_draw.c

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

diff --git a/source/blender/editors/mask/mask_draw.c b/source/blender/editors/mask/mask_draw.c
index 2b4f94a37ef..be7eb2bf9ed 100644
--- a/source/blender/editors/mask/mask_draw.c
+++ b/source/blender/editors/mask/mask_draw.c
@@ -834,13 +834,12 @@ void ED_mask_draw_region(Mask *mask, ARegion *ar,
 
 	/* apply transformation so mask editing tools will assume drawing from the origin in normalized space */
 	glPushMatrix();
-
+	glTranslatef(x + xofs, y + yofs, 0);
+	glScalef(zoomx, zoomy, 0);
 	if (stabmat) {
 		glMultMatrixf(stabmat);
 	}
-
-	glTranslatef(x + xofs, y + yofs, 0);
-	glScalef(maxdim * zoomx, maxdim * zoomy, 0);
+	glScalef(maxdim, maxdim, 0);
 
 	if (do_draw_cb) {
 		ED_region_draw_cb_draw(C, ar, REGION_DRAW_PRE_VIEW);