[Bf-blender-cvs] [61bed8768d4] blender2.8: Cleanup: suppress assert in recent GPU refactor

Campbell Barton noreply at git.blender.org
Fri Jun 22 08:11:31 CEST 2018


Commit: 61bed8768d4d268b7dfa8fe7734c1aebb4bb639c
Author: Campbell Barton
Date:   Fri Jun 22 08:10:59 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB61bed8768d4d268b7dfa8fe7734c1aebb4bb639c

Cleanup: suppress assert in recent GPU refactor

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

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

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

diff --git a/source/blender/gpu/intern/gpu_texture.c b/source/blender/gpu/intern/gpu_texture.c
index 8c66b67a869..63a20ecbe1b 100644
--- a/source/blender/gpu/intern/gpu_texture.c
+++ b/source/blender/gpu/intern/gpu_texture.c
@@ -888,7 +888,7 @@ GPUTexture *GPU_texture_create_from_vertbuf(Gwn_VertBuf *vert)
 
 void GPU_texture_update_sub(GPUTexture *tex, const void *pixels, int offset_x, int offset_y, int offset_z, int width, int height, int depth)
 {
-	BLI_assert(tex->format > -1);
+	BLI_assert((int)tex->format > -1);
 	BLI_assert(tex->components > -1);
 	
 	GLenum format, data_format;



More information about the Bf-blender-cvs mailing list