[Bf-blender-cvs] [48e661e05de] blender2.8: GPUMaterial: Fix assert when shader failed to compile.
Clément Foucault
noreply at git.blender.org
Wed Aug 1 22:10:44 CEST 2018
Commit: 48e661e05de59a055a261430e877f7d8bc4d4c5f
Author: Clément Foucault
Date: Wed Aug 1 21:45:43 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB48e661e05de59a055a261430e877f7d8bc4d4c5f
GPUMaterial: Fix assert when shader failed to compile.
===================================================================
M source/blender/gpu/intern/gpu_shader.c
===================================================================
diff --git a/source/blender/gpu/intern/gpu_shader.c b/source/blender/gpu/intern/gpu_shader.c
index 0d5183d82ab..5346d3f1aee 100644
--- a/source/blender/gpu/intern/gpu_shader.c
+++ b/source/blender/gpu/intern/gpu_shader.c
@@ -580,7 +580,10 @@ void GPU_shader_transform_feedback_disable(GPUShader *UNUSED(shader))
void GPU_shader_free(GPUShader *shader)
{
+#if 0 /* Would be nice to have, but for now the Deferred compilation
+ * does not have a GPUContext. */
BLI_assert(GPU_context_active_get() != NULL);
+#endif
BLI_assert(shader);
if (shader->vertex)
More information about the Bf-blender-cvs
mailing list