diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-06-19 13:18:04 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-06-19 13:18:04 +0300 |
| commit | b4d053efc75424fca4b413ac1bc7a7e826fac629 (patch) | |
| tree | 80647d9ca9109e997fce9911f202f98d7f8577d4 /source/blender/editors/space_clip/clip_graph_draw.c | |
| parent | 349946bd010b1112b13c8594aabfb318c330bc0d (diff) | |
Gawain API naming refactor
Use consistent prefix for gawain API names as well as
some abbreviations to avoid over-long names, see: D2678
Diffstat (limited to 'source/blender/editors/space_clip/clip_graph_draw.c')
| -rw-r--r-- | source/blender/editors/space_clip/clip_graph_draw.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/space_clip/clip_graph_draw.c b/source/blender/editors/space_clip/clip_graph_draw.c index c9db5d4a328..5c2782dc26d 100644 --- a/source/blender/editors/space_clip/clip_graph_draw.c +++ b/source/blender/editors/space_clip/clip_graph_draw.c @@ -90,11 +90,11 @@ static void tracking_segment_start_cb(void *userdata, MovieTrackingTrack *track, immUniformColor4fv(col); if (is_point) { - immBeginAtMost(PRIM_POINTS, 1); + immBeginAtMost(GWN_PRIM_POINTS, 1); } else { /* Graph can be composed of smaller segments, if any marker is disabled */ - immBeginAtMost(PRIM_LINE_STRIP, track->markersnr); + immBeginAtMost(GWN_PRIM_LINE_STRIP, track->markersnr); } } @@ -236,11 +236,11 @@ static void tracking_error_segment_start_cb(void *userdata, MovieTrackingTrack * immUniformColor4fv(col); if (is_point) { /* This probably never happens here, but just in case... */ - immBeginAtMost(PRIM_POINTS, 1); + immBeginAtMost(GWN_PRIM_POINTS, 1); } else { /* Graph can be composed of smaller segments, if any marker is disabled */ - immBeginAtMost(PRIM_LINE_STRIP, track->markersnr); + immBeginAtMost(GWN_PRIM_LINE_STRIP, track->markersnr); } } } @@ -299,7 +299,7 @@ static void draw_frame_curves(SpaceClip *sc, unsigned int pos) } if (!lines) { - immBeginAtMost(PRIM_LINE_STRIP, reconstruction->camnr); + immBeginAtMost(GWN_PRIM_LINE_STRIP, reconstruction->camnr); lines = 1; } @@ -327,7 +327,7 @@ void clip_draw_graph(SpaceClip *sc, ARegion *ar, Scene *scene) UI_view2d_grid_free(grid); if (clip) { - unsigned int pos = VertexFormat_add_attrib(immVertexFormat(), "pos", COMP_F32, 2, KEEP_FLOAT); + unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT); immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR); glPointSize(3.0f); |