[Bf-blender-cvs] [13832988add] master: Fix T62873 GPUShader: compile error (when clipping in viewport)
Clément Foucault
noreply at git.blender.org
Sat Mar 23 19:31:32 CET 2019
Commit: 13832988add506a3c2dca4964e8a9d1216aef80c
Author: Clément Foucault
Date: Sat Mar 23 19:31:20 2019 +0100
Branches: master
https://developer.blender.org/rB13832988add506a3c2dca4964e8a9d1216aef80c
Fix T62873 GPUShader: compile error (when clipping in viewport)
Props to @matc for the fix
===================================================================
M source/blender/draw/engines/workbench/workbench_deferred.c
===================================================================
diff --git a/source/blender/draw/engines/workbench/workbench_deferred.c b/source/blender/draw/engines/workbench/workbench_deferred.c
index a88ab5825ea..7b2030a6863 100644
--- a/source/blender/draw/engines/workbench/workbench_deferred.c
+++ b/source/blender/draw/engines/workbench/workbench_deferred.c
@@ -236,7 +236,7 @@ static GPUShader *ensure_deferred_prepass_shader(
char *prepass_vert = workbench_build_prepass_vert(is_hair);
char *prepass_frag = workbench_build_prepass_frag();
sh_data->prepass_sh_cache[index] = GPU_shader_create_from_arrays({
- .vert = (const char *[]){sh_cfg_data->lib, prepass_vert, NULL},
+ .vert = (const char *[]){prepass_vert, NULL},
.frag = (const char *[]){prepass_frag, NULL},
.defs = (const char *[]){sh_cfg_data->def, defines, NULL},
});
More information about the Bf-blender-cvs
mailing list