[Bf-blender-cvs] [2d3a62fe165] master: Fix invalid NULL check in GPU_viewport_unbind_from_offscreen

[Campbell Barton]

Commit: 2d3a62fe1658f12ddcc2482b11188861310e9386
Author: Campbell Barton
Date:   Wed Mar 23 21:47:13 2022 +1100
Branches: master
https://developer.blender.org/rB2d3a62fe1658f12ddcc2482b11188861310e9386

Fix invalid NULL check in GPU_viewport_unbind_from_offscreen

Mistake from 1d49293b80446b89b5b12fa0eeefaf14e5051e48.

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

M       source/blender/gpu/intern/gpu_viewport.c

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

diff --git a/source/blender/gpu/intern/gpu_viewport.c 
b/source/blender/gpu/intern/gpu_viewport.c
index b5a572bccbe..7bffafd7f9d 100644
--- a/source/blender/gpu/intern/gpu_viewport.c
+++ b/source/blender/gpu/intern/gpu_viewport.c
@@ -505,7 +505,9 @@ void GPU_viewport_unbind_from_offscreen(GPUViewport 
*viewport,
                                         bool display_colorspace,
                                         bool do_overlay_merge)
 {
-  if (viewport->color_render_tx == NULL) {
+  const int view = 0;
+
+  if (viewport->color_render_tx[view] == NULL) {
     return;
   }
 
@@ -527,7 +529,7 @@ void GPU_viewport_unbind_from_offscreen(GPUViewport 
*viewport,
   };
 
   gpu_viewport_draw_colormanaged(
-      viewport, 0, &pos_rect, &uv_rect, display_colorspace, do_overlay_merge);
+      viewport, view, &pos_rect, &uv_rect, display_colorspace, 
do_overlay_merge);
 
   /* This one is from the offscreen. Don't free it with the viewport. */
   viewport->depth_tx = NULL;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs