Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <campbell@blender.org>2022-03-23 13:47:13 +0300
committerCampbell Barton <campbell@blender.org>2022-03-23 13:52:01 +0300
commit2d3a62fe1658f12ddcc2482b11188861310e9386 (patch)
treeb13462104c3860f048d5b974c516d8f0b7f1c145 /source/blender/gpu
parentf634010c6ebedc5e64c53f193f1d33958f113c4c (diff)
Fix invalid NULL check in GPU_viewport_unbind_from_offscreen
Mistake from 1d49293b80446b89b5b12fa0eeefaf14e5051e48.
Diffstat (limited to 'source/blender/gpu')
-rw-r--r--source/blender/gpu/intern/gpu_viewport.c6
1 files changed, 4 insertions, 2 deletions
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;