[Bf-blender-cvs] [ce0d9647386] uvimage-editor-drawing: Fixed UV Stretching GLSL Compilation error

Jeroen Bakker noreply at git.blender.org
Wed Aug 19 10:30:40 CEST 2020


Commit: ce0d96473869433b13987d4d209fe09eee0d9bec
Author: Jeroen Bakker
Date:   Wed Aug 19 10:23:31 2020 +0200
Branches: uvimage-editor-drawing
https://developer.blender.org/rBce0d96473869433b13987d4d209fe09eee0d9bec

Fixed UV Stretching GLSL Compilation error

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

M	source/blender/draw/engines/overlay/overlay_shader.c

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

diff --git a/source/blender/draw/engines/overlay/overlay_shader.c b/source/blender/draw/engines/overlay/overlay_shader.c
index 67671f2479e..d3d2e35bfe3 100644
--- a/source/blender/draw/engines/overlay/overlay_shader.c
+++ b/source/blender/draw/engines/overlay/overlay_shader.c
@@ -122,6 +122,7 @@ extern char datatoc_xray_fade_frag_glsl[];
 extern char datatoc_gpu_shader_depth_only_frag_glsl[];
 extern char datatoc_gpu_shader_point_varying_color_frag_glsl[];
 extern char datatoc_gpu_shader_3D_smooth_color_frag_glsl[];
+extern char datatoc_gpu_shader_2D_smooth_color_frag_glsl[];
 extern char datatoc_gpu_shader_uniform_color_frag_glsl[];
 extern char datatoc_gpu_shader_flat_color_frag_glsl[];
 extern char datatoc_gpu_shader_point_varying_color_varying_outline_aa_frag_glsl[];
@@ -1542,7 +1543,7 @@ GPUShader *OVERLAY_shader_edit_uv_stretching_area_get(void)
     sh_data->edit_uv_stretching_area = DRW_shader_create_with_shaderlib(
         datatoc_edit_uv_stretching_vert_glsl,
         NULL,
-        datatoc_gpu_shader_3D_smooth_color_frag_glsl,
+        datatoc_gpu_shader_2D_smooth_color_frag_glsl,
         e_data.lib,
         "#define blender_srgb_to_framebuffer_space(a) a\n");
   }
@@ -1557,7 +1558,7 @@ GPUShader *OVERLAY_shader_edit_uv_stretching_angle_get(void)
     sh_data->edit_uv_stretching_angle = DRW_shader_create_with_shaderlib(
         datatoc_edit_uv_stretching_vert_glsl,
         NULL,
-        datatoc_gpu_shader_3D_smooth_color_frag_glsl,
+        datatoc_gpu_shader_2D_smooth_color_frag_glsl,
         e_data.lib,
         "#define blender_srgb_to_framebuffer_space(a) a\n#define STRETCH_ANGLE\n");
   }



More information about the Bf-blender-cvs mailing list