[Bf-blender-cvs] [dbb1a692f7b] blender2.8: Revert assert, Eevee uses uniforms that might not exist
Campbell Barton
noreply at git.blender.org
Mon May 22 09:55:38 CEST 2017
Commit: dbb1a692f7b6bc4fd07e7aec400fee3837f0d3cc
Author: Campbell Barton
Date: Mon May 22 17:57:34 2017 +1000
Branches: blender2.8
https://developer.blender.org/rBdbb1a692f7b6bc4fd07e7aec400fee3837f0d3cc
Revert assert, Eevee uses uniforms that might not exist
===================================================================
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 da2d520ccff..94e32424ade 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -623,7 +623,8 @@ static void DRW_interface_uniform(DRWShadingGroup *shgroup, const char *name,
if (uni->location == -1) {
if (G.debug & G_DEBUG)
fprintf(stderr, "Uniform '%s' not found!\n", name);
- BLI_assert(0);
+ /* Nice to enable eventually, for now eevee uses uniforms that might not exist. */
+ // BLI_assert(0);
MEM_freeN(uni);
return;
}
More information about the Bf-blender-cvs
mailing list