[Bf-blender-cvs] [80684ca41c5] master: Fix T74248: Crash using a movie clip for the camera background

Campbell Barton noreply at git.blender.org
Thu Feb 27 06:12:01 CET 2020


Commit: 80684ca41c52bce394fef81d3e70a2a9e14f661a
Author: Campbell Barton
Date:   Thu Feb 27 15:58:31 2020 +1100
Branches: master
https://developer.blender.org/rB80684ca41c52bce394fef81d3e70a2a9e14f661a

Fix T74248: Crash using a movie clip for the camera background

Missing NULL check in recent half-float support.

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

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

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

diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c
index 62a5de7ebe6..d674f8600c2 100644
--- a/source/blender/gpu/intern/gpu_draw.c
+++ b/source/blender/gpu/intern/gpu_draw.c
@@ -1077,7 +1077,8 @@ void GPU_create_gl_tex(uint *bind,
   glGenTextures(1, (GLuint *)bind);
   glBindTexture(textarget, *bind);
 
-  GLenum float_format = (!half_float && ima->flag & IMA_HIGH_BITDEPTH) ? GL_RGBA32F : GL_RGBA16F;
+  GLenum float_format = (!half_float && (ima && (ima->flag & IMA_HIGH_BITDEPTH))) ? GL_RGBA32F :
+                                                                                    GL_RGBA16F;
   GLenum internal_format = (frect) ? float_format : (use_srgb) ? GL_SRGB8_ALPHA8 : GL_RGBA8;
 
   if (textarget == GL_TEXTURE_2D) {



More information about the Bf-blender-cvs mailing list