diff options
author | Severin <eiseljulian@gmail.com> | 2018-07-02 15:50:45 +0300 |
---|---|---|
committer | Severin <eiseljulian@gmail.com> | 2018-07-02 15:50:45 +0300 |
commit | 5a17c9bcbca737525fa535ceb45f9769a34a4df7 (patch) | |
tree | c7867d25494d053d11837d04b1ab8b86526a189d /source/blender/editors/space_clip/clip_draw.c | |
parent | 9887b38692e3bcf7ba613ca947fd76e299c58cbd (diff) | |
parent | 20046defd735684a42750c4cb68d20d78ad5180c (diff) |
Merge branch 'blender2.8' into temp-tab_drag_droptemp-tab_drag_drop
Diffstat (limited to 'source/blender/editors/space_clip/clip_draw.c')
-rw-r--r-- | source/blender/editors/space_clip/clip_draw.c | 6 |
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 d91e039ecb6..c0d17fabe0d 100644 --- a/source/blender/editors/space_clip/clip_draw.c +++ b/source/blender/editors/space_clip/clip_draw.c @@ -368,7 +368,7 @@ static void draw_stabilization_border(SpaceClip *sc, ARegion *ar, int width, int GPU_viewport_size_getf(viewport_size); immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC, viewport_size[3] / UI_DPI_FAC); - immUniform1i("num_colors", 0); /* "simple" mode */ + immUniform1i("colors_len", 0); /* "simple" mode */ immUniformColor4f(1.0f, 1.0f, 1.0f, 0.0f); immUniform1f("dash_width", 6.0f); immUniform1f("dash_factor", 0.5f); @@ -672,7 +672,7 @@ static void draw_marker_areas(SpaceClip *sc, MovieTrackingTrack *track, MovieTra GPU_viewport_size_getf(viewport_size); immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC, viewport_size[3] / UI_DPI_FAC); - immUniform1i("num_colors", 0); /* "simple" mode */ + immUniform1i("colors_len", 0); /* "simple" mode */ /* marker position and offset position */ if ((track->flag & SELECT) == sel && (marker->flag & MARKER_DISABLED) == 0) { @@ -1214,7 +1214,7 @@ static void draw_plane_marker_ex(SpaceClip *sc, Scene *scene, MovieTrackingPlane GPU_viewport_size_getf(viewport_size); immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC, viewport_size[3] / UI_DPI_FAC); - immUniform1i("num_colors", 0); /* "simple" mode */ + immUniform1i("colors_len", 0); /* "simple" mode */ if (draw_plane_quad) { const bool stipple = !draw_outline && tiny; |