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
diff options
context:
space:
mode:
authorMike Erwin <significant.bit@gmail.com>2017-03-21 08:32:25 +0300
committerMike Erwin <significant.bit@gmail.com>2017-03-21 08:32:25 +0300
commit54bed786a6304a1cb33980bcdf6ea8ccd73ff7e1 (patch)
tree2de70323be51a5bd3764fa7ea3aa92342830591c /source/blender/editors/space_clip/clip_graph_draw.c
parent231b5d96bbfd77253941dd37cc4929e4e119d706 (diff)
OpenGL: convert to new matrix API (part 2 of x)
Part of T49450 For this batch I focused on usage of gpuMatrixUpdate_legacy.
Diffstat (limited to 'source/blender/editors/space_clip/clip_graph_draw.c')
-rw-r--r--source/blender/editors/space_clip/clip_graph_draw.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/source/blender/editors/space_clip/clip_graph_draw.c b/source/blender/editors/space_clip/clip_graph_draw.c
index 7afa2ae8145..a9d02018f49 100644
--- a/source/blender/editors/space_clip/clip_graph_draw.c
+++ b/source/blender/editors/space_clip/clip_graph_draw.c
@@ -119,14 +119,13 @@ static void tracking_segment_knot_cb(void *userdata, MovieTrackingTrack *track,
if (sel == data->sel) {
immUniformThemeColor(sel ? TH_HANDLE_VERTEX_SELECT : TH_HANDLE_VERTEX);
- glPushMatrix();
- glTranslatef(scene_framenr, val, 0.0f);
- glScalef(1.0f / data->xscale * data->hsize, 1.0f / data->yscale * data->hsize, 1.0f);
- gpuMatrixUpdate_legacy();
+ gpuPushMatrix();
+ gpuTranslate2f(scene_framenr, val);
+ gpuScale2f(1.0f / data->xscale * data->hsize, 1.0f / data->yscale * data->hsize);
imm_draw_lined_circle(data->pos, 0, 0, 0.7, 8);
- glPopMatrix();
+ gpuPopMatrix();
}
}
@@ -153,9 +152,6 @@ static void draw_tracks_motion_curves(View2D *v2d, SpaceClip *sc, unsigned int p
(sc->flag & SC_SHOW_GRAPH_SEL_ONLY) != 0,
(sc->flag & SC_SHOW_GRAPH_HIDDEN) != 0,
&userdata, tracking_segment_knot_cb, NULL, NULL);
-
- gpuMatrixUpdate_legacy();
-
/* draw graph lines */
glEnable(GL_BLEND);
clip_graph_tracking_values_iterate(sc,
@@ -171,8 +167,6 @@ static void draw_tracks_motion_curves(View2D *v2d, SpaceClip *sc, unsigned int p
(sc->flag & SC_SHOW_GRAPH_SEL_ONLY) != 0,
(sc->flag & SC_SHOW_GRAPH_HIDDEN) != 0,
&userdata, tracking_segment_knot_cb, NULL, NULL);
-
- gpuMatrixUpdate_legacy();
}
typedef struct TrackErrorCurveUserData {