[Bf-blender-cvs] [7f3cda2] testbuild: Fix incorrect 2d stabilization for masks

Sergey Sharybin noreply at git.blender.org
Fri Nov 14 04:29:45 CET 2014


Commit: 7f3cda25476af807d59501a742f09a1b6a372468
Author: Sergey Sharybin
Date:   Thu Aug 21 15:03:44 2014 +0600
Branches: testbuild
https://developer.blender.org/rB7f3cda25476af807d59501a742f09a1b6a372468

Fix incorrect 2d stabilization for masks

Reported by Sebastian Koenig in IRC>

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

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 9409203..7e767d8 100644
--- a/source/blender/editors/mask/mask_draw.c
+++ b/source/blender/editors/mask/mask_draw.c
@@ -834,13 +834,14 @@ 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(maxdim * zoomx, maxdim * zoomy, 0);
 
 	if (stabmat) {
 		glMultMatrixf(stabmat);
 	}
 
+	glTranslatef(x + xofs, y + yofs, 0);
+	glScalef(maxdim * zoomx, maxdim * zoomy, 0);
+
 	if (do_draw_cb) {
 		ED_region_draw_cb_draw(C, ar, REGION_DRAW_PRE_VIEW);
 	}




More information about the Bf-blender-cvs mailing list