[Bf-blender-cvs] [6b7bc30c643] master: Fix T66470 Planar track is not adjustable

[Clément Foucault]

Commit: 6b7bc30c6436ed8924dad003637344a0a7544243
Author: Clément Foucault
Date:   Sun Jul 7 18:59:19 2019 +0200
Branches: master
https://developer.blender.org/rB6b7bc30c6436ed8924dad003637344a0a7544243

Fix T66470 Planar track is not adjustable

The issue was that the shader used was expecting GL_LINES and the points
were using GL_TRIANGLE_FAN.

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

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

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

diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c
index 99f9a91775e..e3fa8edd714 100644
--- a/source/blender/editors/space_clip/clip_draw.c
+++ b/source/blender/editors/space_clip/clip_draw.c
@@ -1378,10 +1378,11 @@ static void draw_plane_marker_ex(SpaceClip *sc,
         immEnd();
       }
     }
+    immUnbindProgram();
 
     /* Draw sliders. */
     if (is_selected_track) {
-      immUniform1f("dash_factor", 2.0f); /* Solid line */
+      immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
       if (draw_outline) {
         immUniformThemeColor(TH_MARKER_OUTLINE);
@@ -1400,9 +1401,8 @@ static void draw_plane_marker_ex(SpaceClip *sc,
                                  px,
                                  shdr_pos);
       }
+      immUnbindProgram();
     }
-
-    immUnbindProgram();
   }
 }