[Bf-blender-cvs] [dce5210946e] tmp-gpu-shader-descriptor-2: Fix create info mismatch.

[Jeroen Bakker]

Commit: dce5210946ee99b87acfef6381f75791a035477f
Author: Jeroen Bakker
Date:   Wed Jan 12 09:46:15 2022 +0100
Branches: tmp-gpu-shader-descriptor-2
https://developer.blender.org/rBdce5210946ee99b87acfef6381f75791a035477f

Fix create info mismatch.

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

M	release/datafiles/locale
M	release/scripts/addons
M	source/blender/gpu/intern/gpu_shader_builtin.c
M	source/tools

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

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 620b85f16d0..d46eacffd92 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 620b85f16d03a6aadd7cae56969c9c29b06b992d
+Subproject commit d46eacffd92496ae9702a71dfc4da235eaf7731b
diff --git a/release/scripts/addons b/release/scripts/addons
index c08568cc376..880efe429a6 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit c08568cc376d2e4298710c4172fb0c74f0611de1
+Subproject commit 880efe429a65eb33f731dc72a9a14ee25fae7c03
diff --git a/source/blender/gpu/intern/gpu_shader_builtin.c b/source/blender/gpu/intern/gpu_shader_builtin.c
index db1b7f5fb45..a9067ea5968 100644
--- a/source/blender/gpu/intern/gpu_shader_builtin.c
+++ b/source/blender/gpu/intern/gpu_shader_builtin.c
@@ -187,14 +187,10 @@ static const GPUShaderStages builtin_shader_stages[GPU_SHADER_BUILTIN_LEN] = {
             .create_info = "gpu_shader_2D_diag_stripes",
         },
 
-    [GPU_SHADER_2D_UNIFORM_COLOR] =
-        {
-            .name = "GPU_SHADER_2D_UNIFORM_COLOR",
-            .vert = datatoc_gpu_shader_2D_vert_glsl,
-            .frag = datatoc_gpu_shader_uniform_color_frag_glsl,
-        },
+    [GPU_SHADER_2D_UNIFORM_COLOR] = {.name = "GPU_SHADER_2D_UNIFORM_COLOR",
+                                     .create_info = "gpu_shader_2D_uniform_color"},
     [GPU_SHADER_2D_FLAT_COLOR] = {.name = "GPU_SHADER_2D_FLAT_COLOR",
-                                  .create_info = "gpu_shader_2D_uniform_color"},
+                                  .create_info = "gpu_shader_2D_flat_color"},
     [GPU_SHADER_2D_SMOOTH_COLOR] = {.name = "GPU_SHADER_2D_SMOOTH_COLOR",
                                     .create_info = "gpu_shader_2D_smooth_color"},
     [GPU_SHADER_2D_IMAGE_OVERLAYS_MERGE] = {.name = "GPU_SHADER_2D_IMAGE_OVERLAYS_MERGE",
diff --git a/source/tools b/source/tools
index 26bc78162ec..dc7c95f3098 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 26bc78162ec89f21453ce3ded7b999bc6649f32b
+Subproject commit dc7c95f30989e15ffd98f665efe9cb7bc02cecc5