[Bf-blender-cvs] [24607a2940e] master: Fix T64758: crash loading certain DDS textures

Brecht Van Lommel noreply at git.blender.org
Tue May 21 13:01:00 CEST 2019


Commit: 24607a2940e72de5bae5ac1cb14eee29a3fcb02b
Author: Brecht Van Lommel
Date:   Tue May 21 13:00:43 2019 +0200
Branches: master
https://developer.blender.org/rB24607a2940e72de5bae5ac1cb14eee29a3fcb02b

Fix T64758: crash loading certain DDS textures

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

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 2220eef4034..638729d027c 100644
--- a/source/blender/gpu/intern/gpu_draw.c
+++ b/source/blender/gpu/intern/gpu_draw.c
@@ -757,7 +757,7 @@ void GPU_create_gl_tex_compressed(unsigned int *bind, int textarget, Image *ima,
 
   if (textarget == GL_TEXTURE_2D && GPU_upload_dxt_texture(ibuf, use_srgb) == 0) {
     glDeleteTextures(1, (GLuint *)bind);
-    GPU_create_gl_tex(bind, ibuf->rect, NULL, ibuf->x, ibuf->x, textarget, mipmap, use_srgb, ima);
+    GPU_create_gl_tex(bind, ibuf->rect, NULL, ibuf->x, ibuf->y, textarget, mipmap, use_srgb, ima);
   }
 
   glBindTexture(textarget, 0);



More information about the Bf-blender-cvs mailing list