diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-01-02 13:34:05 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-01-02 13:47:26 +0300 |
| commit | 329879239e6fa358e22bf92180e3d5ff9cee9ba1 (patch) | |
| tree | 95788aa13fcec9605c874bd34128b8710d2fedd9 /source/blender/windowmanager/intern/wm_stereo.c | |
| parent | d78f51a4c239d9e4ab659c3386b6262ff8a4b8df (diff) | |
| parent | 070f22c44082c1a7405795744cec667157abbfbf (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
I'm deliberately ignoring/reverting rB070f22c4 which in turns means T49861 is happening on 2.8
Diffstat (limited to 'source/blender/windowmanager/intern/wm_stereo.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_stereo.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/windowmanager/intern/wm_stereo.c b/source/blender/windowmanager/intern/wm_stereo.c index f625423caa8..8b28d2ccb95 100644 --- a/source/blender/windowmanager/intern/wm_stereo.c +++ b/source/blender/windowmanager/intern/wm_stereo.c @@ -78,7 +78,7 @@ static void wm_method_draw_stereo3d_pageflip(wmWindow *win) else //STEREO_RIGHT_ID glDrawBuffer(GL_BACK_RIGHT); - wm_triple_draw_textures(win, drawdata->triple, 1.0f); + wm_triple_draw_textures(win, drawdata->triple, 1.0f, false); } glDrawBuffer(GL_BACK); @@ -121,7 +121,7 @@ static void wm_method_draw_stereo3d_interlace(wmWindow *win) break; } - wm_triple_draw_textures(win, drawdata->triple, 1.0f); + wm_triple_draw_textures(win, drawdata->triple, 1.0f, true); GPU_basic_shader_bind(GPU_SHADER_USE_COLOR); } interlace_prev_type = interlace_type; @@ -158,7 +158,7 @@ static void wm_method_draw_stereo3d_anaglyph(wmWindow *win) break; } - wm_triple_draw_textures(win, drawdata->triple, 1.0f); + wm_triple_draw_textures(win, drawdata->triple, 1.0f, false); glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); } |