[Bf-blender-cvs] [e0d7b6c78d4] blender-v2.83-release: Fix T75751 Overlay: Clipping Region crashes Blender

Clément Foucault noreply at git.blender.org
Wed Apr 15 22:55:06 CEST 2020


Commit: e0d7b6c78d4f2481b5ca2382a1dea61d1d96e856
Author: Clément Foucault
Date:   Wed Apr 15 22:30:22 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rBe0d7b6c78d4f2481b5ca2382a1dea61d1d96e856

Fix T75751 Overlay: Clipping Region crashes Blender

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

M	source/blender/draw/engines/overlay/overlay_shader.c

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

diff --git a/source/blender/draw/engines/overlay/overlay_shader.c b/source/blender/draw/engines/overlay/overlay_shader.c
index 2bb3555b8d1..607981cb0d0 100644
--- a/source/blender/draw/engines/overlay/overlay_shader.c
+++ b/source/blender/draw/engines/overlay/overlay_shader.c
@@ -233,10 +233,12 @@ GPUShader *OVERLAY_shader_background(void)
 GPUShader *OVERLAY_shader_clipbound(void)
 {
   OVERLAY_Shaders *sh_data = &e_data.sh_data[0];
+  const GPUShaderConfigData *sh_cfg = &GPU_shader_cfg_data[0];
   if (!sh_data->clipbound) {
     sh_data->clipbound = GPU_shader_create_from_arrays({
         .vert = (const char *[]){datatoc_common_view_lib_glsl, datatoc_clipbound_vert_glsl, NULL},
         .frag = (const char *[]){datatoc_gpu_shader_uniform_color_frag_glsl, NULL},
+        .defs = (const char *[]){sh_cfg->def, NULL},
     });
   }
   return sh_data->clipbound;



More information about the Bf-blender-cvs mailing list