diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2019-01-10 19:59:11 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2019-01-11 18:00:23 +0300 |
| commit | 621a6d4a5de872a94f81d239ff627d24afecc56b (patch) | |
| tree | e5b563f388f9a7f635b8255549c33b49d1ce83ff /source/blender/gpu/intern | |
| parent | 5f3fdee53a3e2716013147029e6da9e90e2c8ba8 (diff) | |
UVEdit: Add back uv angle stretch aspect correction
This is now done in shader so that the batches are shared across ImageUV
areas.
Diffstat (limited to 'source/blender/gpu/intern')
| -rw-r--r-- | source/blender/gpu/intern/gpu_shader.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/gpu/intern/gpu_shader.c b/source/blender/gpu/intern/gpu_shader.c index 88d4f1e5c52..8a3581c54df 100644 --- a/source/blender/gpu/intern/gpu_shader.c +++ b/source/blender/gpu/intern/gpu_shader.c @@ -933,7 +933,10 @@ static const GPUShaderStages builtin_shader_stages[GPU_NUM_BUILTIN_SHADERS] = { [GPU_SHADER_2D_UV_FACES] = { datatoc_gpu_shader_2D_edituvs_faces_vert_glsl, datatoc_gpu_shader_flat_color_frag_glsl }, - [GPU_SHADER_2D_UV_FACES_STRETCH] = + [GPU_SHADER_2D_UV_FACES_STRETCH_AREA] = + { datatoc_gpu_shader_2D_edituvs_stretch_vert_glsl, + datatoc_gpu_shader_2D_smooth_color_frag_glsl }, + [GPU_SHADER_2D_UV_FACES_STRETCH_ANGLE] = { datatoc_gpu_shader_2D_edituvs_stretch_vert_glsl, datatoc_gpu_shader_2D_smooth_color_frag_glsl }, @@ -1010,6 +1013,9 @@ static const char *gpu_shader_get_builtin_shader_defines( case GPU_SHADER_3D_UNIFORM_SELECT_ID: return "#define UNIFORM_ID\n"; + case GPU_SHADER_2D_UV_FACES_STRETCH_ANGLE: + return "#define STRETCH_ANGLE\n"; + default: return NULL; } |