[Bf-blender-cvs] [3a96cfcd26e] blender2.8: Fix crash on startup on macOS, after recent framebuffer refactoring.

Brecht Van Lommel noreply at git.blender.org
Tue Apr 3 09:36:39 CEST 2018


Commit: 3a96cfcd26e158304df55923fa38bd1d0b995b0d
Author: Brecht Van Lommel
Date:   Tue Apr 3 09:35:22 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB3a96cfcd26e158304df55923fa38bd1d0b995b0d

Fix crash on startup on macOS, after recent framebuffer refactoring.

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

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 27408ff9c25..8d8fb50d9b9 100644
--- a/source/blender/gpu/intern/gpu_framebuffer.c
+++ b/source/blender/gpu/intern/gpu_framebuffer.c
@@ -427,7 +427,7 @@ unsigned int GPU_framebuffer_current_get(void)
 
 bool GPU_framebuffer_check_valid(GPUFrameBuffer *fb, char err_out[256])
 {
-	if (g_currentfb != fb->object)
+	if (!GPU_framebuffer_bound(fb))
 		GPU_framebuffer_bind(fb);
 
 	GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);



More information about the Bf-blender-cvs mailing list