[Bf-blender-cvs] [51b6e313de1] blender2.8: Fix T57326: Adding Scene with Transparent Film to VSE Crashes Blender

Clément Foucault noreply at git.blender.org
Tue Oct 23 18:04:56 CEST 2018


Commit: 51b6e313de10c2495fde0d548df45f0d4b442d88
Author: Clément Foucault
Date:   Mon Oct 22 22:49:33 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB51b6e313de10c2495fde0d548df45f0d4b442d88

Fix T57326: Adding Scene with Transparent Film to VSE Crashes Blender

Previous Framebuffer can be NULL.

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

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 7329eee44b0..20341b5d1e2 100644
--- a/source/blender/gpu/intern/gpu_framebuffer.c
+++ b/source/blender/gpu/intern/gpu_framebuffer.c
@@ -605,10 +605,14 @@ void GPU_framebuffer_blit(
 	if (fb_write == prev_fb) {
 		GPU_framebuffer_bind(fb_write); /* To update drawbuffers */
 	}
-	else {
+	else if (prev_fb) {
 		glBindFramebuffer(GL_FRAMEBUFFER, prev_fb->object);
 		gpu_framebuffer_current_set(prev_fb);
 	}
+	else {
+		glBindFramebuffer(GL_FRAMEBUFFER, 0);
+		gpu_framebuffer_current_set(NULL);
+	}
 }
 
 /**



More information about the Bf-blender-cvs mailing list