[Bf-blender-cvs] [5e51a5e8a48] master: Fix error in previous commit.

Jeroen Bakker noreply at git.blender.org
Fri Jan 21 14:35:43 CET 2022


Commit: 5e51a5e8a4847c4f42ca44e260b82d08fda7f051
Author: Jeroen Bakker
Date:   Fri Jan 21 14:35:27 2022 +0100
Branches: master
https://developer.blender.org/rB5e51a5e8a4847c4f42ca44e260b82d08fda7f051

Fix error in previous commit.

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

M	source/blender/gpu/intern/gpu_shader_builtin.c

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

diff --git a/source/blender/gpu/intern/gpu_shader_builtin.c b/source/blender/gpu/intern/gpu_shader_builtin.c
index 931c3750ac8..9c8dbf8401f 100644
--- a/source/blender/gpu/intern/gpu_shader_builtin.c
+++ b/source/blender/gpu/intern/gpu_shader_builtin.c
@@ -198,8 +198,8 @@ static const GPUShaderStages builtin_shader_stages[GPU_SHADER_BUILTIN_LEN] = {
 #ifdef __APPLE__
             /* GPUShaderCreateInfo is disabled on MacOS due to mismatch with OCIO shader. See
              * T95052 for more details. */
-            .vert = "gpu_shader_2D_image_vert.glsl",
-            .frag = "gpu_shader_image_overlays_merge_frag.glsl",
+            .vert = datatoc_gpu_shader_2D_image_vert_glsl,
+            .frag = datatoc_gpu_shader_image_overlays_merge_frag_glsl,
 #else
             .create_info = "gpu_shader_2D_image_overlays_merge",
 #endif



More information about the Bf-blender-cvs mailing list