Fix T71379: Offset Edge Slide with Even option: random points on screen
AbandonedPublic
Actions

Authored by Campbell Barton (campbellbarton) on Nov 7 2019, 6:53 PM.

Details

Reviewers

Clément Foucault (fclem)
Philipp Oeser (lichtwerk)

Maniphest Tasks

T71379: Offset Edge Slide with Even option: random points on screen

Summary

It is not garuanteed that the Offset Edge Slide ctrl point [red dot] is
actually drawing, so doing immBegin(GPU_PRIM_POINTS, 1) [when actually
not drawing a point -- no immVertex3fv called] will assert (or begin
drawing funky in release).

Using immBeginAtMost fixes.

Diff Detail

Repository

rB Blender

Branch

T71379 (branched from master)

Build Status

Buildable 5611
Build 5611: arc lint + arc unit

Event Timeline

Philipp Oeser (lichtwerk) created this revision.Nov 7 2019, 6:53 PM

Harbormaster completed remote builds in B5611: Diff 19479.Nov 7 2019, 6:53 PM

Clément Foucault (fclem) accepted this revision.Nov 7 2019, 10:29 PM

This revision is now accepted and ready to land.Nov 7 2019, 10:29 PM

Campbell Barton (campbellbarton) accepted this revision.Nov 8 2019, 4:24 AM

Suggest not to draw the point if it's not needed:

diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 9f53c38c403..dda61cb12c0 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -7576,20 +7576,27 @@ static void drawEdgeSlide(TransInfo *t)
         }
         immEnd();
 
-        immUniformThemeColorShadeAlpha(TH_SELECT, -30, alpha_shade);
-        GPU_point_size(ctrl_size);
-        immBegin(GPU_PRIM_POINTS, 1);
-        if (slp->flipped) {
-          if (curr_sv->v_side[1]) {
-            immVertex3fv(pos, curr_sv->v_side[1]->co);
+        {
+          const float *co = NULL;
+          if (slp->flipped) {
+            if (curr_sv->v_side[1]) {
+              co = curr_sv->v_side[1]->co;
+            }
           }
-        }
-        else {
-          if (curr_sv->v_side[0]) {
-            immVertex3fv(pos, curr_sv->v_side[0]->co);
+          else {
+            if (curr_sv->v_side[0]) {
+              co = curr_sv->v_side[0]->co;
+            }
+          }
+
+          if (co != NULL) {
+            immUniformThemeColorShadeAlpha(TH_SELECT, -30, alpha_shade);
+            GPU_point_size(ctrl_size);
+            immBegin(GPU_PRIM_POINTS, 1);
+            immVertex3fv(pos, co);
+            immEnd();
           }
         }
-        immEnd();
 
         immUniformThemeColorShadeAlpha(TH_SELECT, 255, alpha_shade);
         GPU_point_size(guide_size);