[Bf-blender-cvs] [b0b24b77ffc] master: Fix T68796: stereo side-by-side and pageflip not drawing correctly

Brecht Van Lommel noreply at git.blender.org
Fri Sep 6 20:39:45 CEST 2019


Commit: b0b24b77ffc3e34b3aef24ff658826a8aeca7782
Author: Brecht Van Lommel
Date:   Fri Sep 6 10:49:28 2019 +0200
Branches: master
https://developer.blender.org/rBb0b24b77ffc3e34b3aef24ff658826a8aeca7782

Fix T68796: stereo side-by-side and pageflip not drawing correctly

===================================================================

M	source/blender/windowmanager/intern/wm_draw.c

===================================================================

diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c
index 3bcb955c2b2..0266a30dea6 100644
--- a/source/blender/windowmanager/intern/wm_draw.c
+++ b/source/blender/windowmanager/intern/wm_draw.c
@@ -436,6 +436,17 @@ static void wm_draw_region_blit(ARegion *ar, int view)
     return;
   }
 
+  if (view == -1) {
+    /* Non-stereo drawing. */
+    view = 0;
+  }
+  else if (view > 0) {
+    if (ar->draw_buffer->viewport[view] == NULL && ar->draw_buffer->offscreen[view] == NULL) {
+      /* Region does not need stereo or failed to allocate stereo buffers. */
+      view = 0;
+    }
+  }
+
   if (ar->draw_buffer->viewport[view]) {
     GPU_viewport_draw_to_screen(ar->draw_buffer->viewport[view], &ar->winrct);
   }
@@ -688,7 +699,7 @@ static void wm_draw_window_onscreen(bContext *C, wmWindow *win, int view)
         }
         else {
           /* Blit from offscreen buffer. */
-          wm_draw_region_blit(ar, 0);
+          wm_draw_region_blit(ar, view);
         }
       }
     }



More information about the Bf-blender-cvs mailing list