Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <jeroen@blender.org>2022-01-12 11:46:15 +0300
committerJeroen Bakker <jeroen@blender.org>2022-01-12 11:46:15 +0300
commitdce5210946ee99b87acfef6381f75791a035477f (patch)
treeedb004a7bcd534a4cc4f88bf34ba0f246c6ddf8e
parent7eeb7fd4062f18d729c58a35b2658eb07133b541 (diff)
Fix create info mismatch.
m---------release/datafiles/locale0
m---------release/scripts/addons0
-rw-r--r--source/blender/gpu/intern/gpu_shader_builtin.c10
m---------source/tools0
4 files changed, 3 insertions, 7 deletions
diff --git a/release/datafiles/locale b/release/datafiles/locale
-Subproject 620b85f16d03a6aadd7cae56969c9c29b06b992
+Subproject d46eacffd92496ae9702a71dfc4da235eaf7731
diff --git a/release/scripts/addons b/release/scripts/addons
-Subproject c08568cc376d2e4298710c4172fb0c74f0611de
+Subproject 880efe429a65eb33f731dc72a9a14ee25fae7c0
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
-Subproject 26bc78162ec89f21453ce3ded7b999bc6649f32
+Subproject dc7c95f30989e15ffd98f665efe9cb7bc02cecc