diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2017-04-15 08:29:25 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2017-04-15 08:29:56 +0300 |
| commit | 4b043994e8795f37e9227362fe24fd66d45c6b39 (patch) | |
| tree | 921b417669349cc5cc592634bf7b304a4f3820de /source/blender/editors/mask | |
| parent | ff3942505a8d861d0024ce4e95bd80da6ee303de (diff) | |
GPU Matrix API: clean up after 2D-3D unification
See GPU_matrix.h & gpu_matrix.c for the important changes. Other files are mostly just updated to use the latest API.
- remove unused functions, defines, enums, comments
- remove "3D" from function names
- init to Identity transform (otherwise empty stack)
- gpuMatrixReset lets outside code return to initial state
Part of T49450
Follow up to D2626 and 49fc9cff3b90
Diffstat (limited to 'source/blender/editors/mask')
| -rw-r--r-- | source/blender/editors/mask/mask_draw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/mask/mask_draw.c b/source/blender/editors/mask/mask_draw.c index c4f62fdaf97..228a4db74e1 100644 --- a/source/blender/editors/mask/mask_draw.c +++ b/source/blender/editors/mask/mask_draw.c @@ -767,7 +767,7 @@ void ED_mask_draw_region(Mask *mask, ARegion *ar, gpuTranslate2f(x, y); gpuScale2f(zoomx, zoomy); if (stabmat) { - gpuMultMatrix3D(stabmat); /* XXX make this a 2D matrix */ + gpuMultMatrix(stabmat); } IMMDrawPixelsTexState state = immDrawPixelsTexSetup(GPU_SHADER_2D_IMAGE_SHUFFLE_COLOR); GPU_shader_uniform_vector(state.shader, GPU_shader_get_uniform(state.shader, "shuffle"), 4, 1, red); @@ -786,7 +786,7 @@ void ED_mask_draw_region(Mask *mask, ARegion *ar, gpuPushMatrix(); if (stabmat) { - gpuMultMatrix3D(stabmat); /* XXX make this a 2D matrix */ + gpuMultMatrix(stabmat); } gpuTranslate2f(x + xofs, y + yofs); |