[Bf-blender-cvs] [7cb65a1e674] master: Fix T84990: Proportional Editing falloff drawing for masks in MCE is broken

Sergey Sharybin noreply at git.blender.org
Mon Jan 25 11:22:27 CET 2021


Commit: 7cb65a1e674c462393aadbb8c76283c4e3a8a16f
Author: Sergey Sharybin
Date:   Mon Jan 25 11:08:48 2021 +0100
Branches: master
https://developer.blender.org/rB7cb65a1e674c462393aadbb8c76283c4e3a8a16f

Fix T84990: Proportional Editing falloff drawing for masks in MCE is broken

This got broken in 4b1112c8c96. A fix which will be consistent with image
editor is not obviously clear, so for the time being revert the change and
go back to state which was working for a long time.

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

M	source/blender/editors/space_clip/space_clip.c

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

diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c
index d4391fc3ff4..a5935f06927 100644
--- a/source/blender/editors/space_clip/space_clip.c
+++ b/source/blender/editors/space_clip/space_clip.c
@@ -993,10 +993,14 @@ static void clip_main_region_draw(const bContext *C, ARegion *region)
   }
 
   /* callback */
-  GPU_matrix_push_projection();
-  wmOrtho2(region->v2d.cur.xmin, region->v2d.cur.xmax, region->v2d.cur.ymin, region->v2d.cur.ymax);
+  /* TODO(sergey): For being consistent with space image the projection needs to be configured
+   * the way how the commented out code does it. This works corrent for tracking data, but it
+   * causes wrong aspect correction for mask editor (see T84990). */
+  // GPU_matrix_push_projection();
+  // wmOrtho2(region->v2d.cur.xmin, region->v2d.cur.xmax, region->v2d.cur.ymin,
+  //          region->v2d.cur.ymax);
   ED_region_draw_cb_draw(C, region, REGION_DRAW_POST_VIEW);
-  GPU_matrix_pop_projection();
+  // GPU_matrix_pop_projection();
 
   /* reset view matrix */
   UI_view2d_view_restore(C);



More information about the Bf-blender-cvs mailing list