[Bf-blender-cvs] [5e05db3419e] master: Fix shader error sRGB gizmo drawing workaround

[Campbell Barton]

Commit: 5e05db3419ef4598fea7e31f86ab37ffe41835f5
Author: Campbell Barton
Date:   Wed Apr 15 14:49:01 2020 +1000
Branches: master
https://developer.blender.org/rB5e05db3419ef4598fea7e31f86ab37ffe41835f5

Fix shader error sRGB gizmo drawing workaround

Issue in 21c658b718b9b with function being defined twice.

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

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 dc26a1a8e7b..3c2266bd65d 100644
--- a/source/blender/gpu/intern/gpu_shader.c
+++ b/source/blender/gpu/intern/gpu_shader.c
@@ -1024,7 +1024,6 @@ static const GPUShaderStages 
builtin_shader_stages[GPU_SHADER_BUILTIN_LEN] = {
         {
             .vert = datatoc_gpu_shader_3D_clipped_uniform_color_vert_glsl,
             .frag = datatoc_gpu_shader_uniform_color_frag_glsl,
-            .defs = datatoc_gpu_shader_colorspace_lib_glsl,
         },
 
     [GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR] =

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs