[Bf-blender-cvs] [539225db811] blender2.8: DrwManager: Remove the need for buffers to be available.

Clément Foucault noreply at git.blender.org
Mon Jun 19 10:48:09 CEST 2017


Commit: 539225db8111796c2e194b13a5e4081fe487684a
Author: Clément Foucault
Date:   Fri Jun 16 15:11:23 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB539225db8111796c2e194b13a5e4081fe487684a

DrwManager: Remove the need for buffers to be available.

This way we can just avoid binding a texture by setting it's ref to NULL.

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

M	source/blender/draw/intern/draw_manager.c

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

diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 485ce168bb5..f1a870992dc 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1733,6 +1733,10 @@ static void draw_shgroup(DRWShadingGroup *shgroup, DRWState pass_state)
 					break;
 				}
 				tex = *((GPUTexture **)uni->value);
+				if (tex == NULL) {
+					/* In case texture is not yet available */
+					break;
+				}
 				GPU_texture_bind(tex, uni->bindloc);
 
 				bound_tex = MEM_callocN(sizeof(DRWBoundTexture), "DRWBoundTexture");




More information about the Bf-blender-cvs mailing list