Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2019-07-07 19:59:19 +0300
committerClément Foucault <foucault.clem@gmail.com>2019-07-08 19:09:52 +0300
commit6b7bc30c6436ed8924dad003637344a0a7544243 (patch)
treefd3615232b5997e6d29a942c10c09e8d7b10a788 /source
parent226c6f086aa255bb71e554c860545bb435c06756 (diff)
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.
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/space_clip/clip_draw.c6
1 files changed, 3 insertions, 3 deletions
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();
}
}