diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2017-03-27 04:23:11 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2017-03-27 04:23:55 +0300 |
| commit | 8b204831f2e3d1c8f4eed720ce618e2240d627b4 (patch) | |
| tree | de43a1ddf89fb6263f13e111a1da04e31114fd16 | |
| parent | 4c08c5b192415190ab8b11637d8dc4f2a66c2ddf (diff) | |
OpenGL: use new matrix implementation in "Modern" viewport
This change looks small, but it switches the entire 3D viewport from legacy OpenGL functions to our own code.
Kept non-modern viewport on legacy path so we can compare easily (via the Modern Viewport checkbox).
Part of T49450
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 808933b5d80..eef040053e9 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -2286,10 +2286,7 @@ static void view3d_draw_view(const bContext *C, ARegion *ar, DrawData *draw_data glClear(GL_DEPTH_BUFFER_BIT); // glDisable(GL_DEPTH_TEST); /* should be set by default */ - glMatrixMode(GL_PROJECTION); // - gpuLoadIdentity(); // TODO: replace these lines with gpuMatrixBegin3D - glMatrixMode(GL_MODELVIEW); // - gpuLoadIdentity(); // + gpuMatrixBegin3D(); view3d_draw_background(C); /* clears/overwrites entire color buffer */ @@ -2313,6 +2310,8 @@ static void view3d_draw_view(const bContext *C, ARegion *ar, DrawData *draw_data view3d_draw_reference_images(C); view3d_draw_manipulator(C); + gpuMatrixEnd(); + glDisable(GL_DEPTH_TEST); view3d_draw_region_info(C, ar); |