[Bf-blender-cvs] [0acccda4a41] blender2.8: GPUMaterial: Fix non finished material status if shader has no output.

Clément Foucault noreply at git.blender.org
Tue Mar 13 04:26:27 CET 2018


Commit: 0acccda4a4146dfa0f2d9d848adc83d21a83c0b7
Author: Clément Foucault
Date:   Tue Mar 13 03:49:04 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB0acccda4a4146dfa0f2d9d848adc83d21a83c0b7

GPUMaterial: Fix non finished material status if shader has no output.

This wasn't producing any issue for now but it's better to make things clean.

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

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

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

diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c
index 6eeac4236dc..a408a41513a 100644
--- a/source/blender/gpu/intern/gpu_material.c
+++ b/source/blender/gpu/intern/gpu_material.c
@@ -2572,6 +2572,9 @@ void GPU_material_generate_pass(
 		        mat, mat->outlink, &mat->attribs, &mat->nodes, &mat->inputs, vert_code, geom_code, frag_lib, defines);
 		mat->status = (mat->pass) ? GPU_MAT_SUCCESS : GPU_MAT_FAILED;
 	}
+	else {
+		mat->status = GPU_MAT_FAILED;
+	}
 }
 
 GPUMaterial *GPU_material_from_blender(Scene *scene, Material *ma, bool use_opensubdiv)



More information about the Bf-blender-cvs mailing list