[Bf-blender-cvs] [2ff490f9e3d] master: Fix: Crash Requesting GPU_SHADER_GPENCIL_FILL builtin shader.

Jeroen Bakker noreply at git.blender.org
Mon Jun 28 08:55:20 CEST 2021


Commit: 2ff490f9e3d61cfc5e18f1eb660aff80da7d021a
Author: Jeroen Bakker
Date:   Mon Jun 28 08:51:37 2021 +0200
Branches: master
https://developer.blender.org/rB2ff490f9e3d61cfc5e18f1eb660aff80da7d021a

Fix: Crash Requesting GPU_SHADER_GPENCIL_FILL builtin shader.

Shader doesn't have any shader code. Requesting the shader
would crash blender. Solved by removing the enum_value.

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

M	source/blender/gpu/GPU_shader.h

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

diff --git a/source/blender/gpu/GPU_shader.h b/source/blender/gpu/GPU_shader.h
index 3923c920c9e..f834ee5b234 100644
--- a/source/blender/gpu/GPU_shader.h
+++ b/source/blender/gpu/GPU_shader.h
@@ -366,7 +366,6 @@ typedef enum eGPUBuiltinShader {
   GPU_SHADER_INSTANCE_VARIYING_COLOR_VARIYING_SIZE, /* Uniformly scaled */
   /* grease pencil drawing */
   GPU_SHADER_GPENCIL_STROKE,
-  GPU_SHADER_GPENCIL_FILL,
   /* specialized for widget drawing */
   GPU_SHADER_2D_AREA_EDGES,
   GPU_SHADER_2D_WIDGET_BASE,



More information about the Bf-blender-cvs mailing list