[Bf-blender-cvs] [a06d803a5ac] blender2.8: Fix T56817: Assert because of invalid framebuffer

Clément Foucault noreply at git.blender.org
Sun Sep 16 21:23:08 CEST 2018


Commit: a06d803a5ac29885d575a8b0acba0160223d18f9
Author: Clément Foucault
Date:   Sun Sep 16 21:22:55 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBa06d803a5ac29885d575a8b0acba0160223d18f9

Fix T56817: Assert because of invalid framebuffer

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

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

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

diff --git a/source/blender/gpu/intern/gpu_framebuffer.c b/source/blender/gpu/intern/gpu_framebuffer.c
index f915ab758ed..ab96efe540a 100644
--- a/source/blender/gpu/intern/gpu_framebuffer.c
+++ b/source/blender/gpu/intern/gpu_framebuffer.c
@@ -628,6 +628,9 @@ void GPU_framebuffer_recursive_downsample(
 	GPUFrameBuffer *prev_fb = GPU_framebuffer_active_get();
 	gpu_framebuffer_current_set(NULL);
 
+	int levels = floor(log2(max_ii(fb->width, fb->height)));
+	max_lvl = min_ii(max_lvl, levels);
+
 	int i;
 	int current_dim[2] = {fb->width, fb->height};
 	for (i = 1; i < max_lvl + 1; i++) {



More information about the Bf-blender-cvs mailing list