From 57639186514079d3fce590006616c543628fe1d8 Mon Sep 17 00:00:00 2001 From: Germano Cavalcante Date: Mon, 5 Sep 2022 17:34:10 -0300 Subject: GPU: convert 'GPU_SHADER_2D_IMAGE_COLOR' to 3D 3D shaders work in both 2D and 3D viewports. This shader is a good candidate to be exposed in Python. --- source/blender/gpu/intern/gpu_shader_builtin.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to '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 d255084609e..7973c635cb8 100644 --- a/source/blender/gpu/intern/gpu_shader_builtin.c +++ b/source/blender/gpu/intern/gpu_shader_builtin.c @@ -136,6 +136,11 @@ static const GPUShaderStages builtin_shader_stages[GPU_SHADER_BUILTIN_LEN] = { .name = "GPU_SHADER_3D_IMAGE", .create_info = "gpu_shader_3D_image", }, + [GPU_SHADER_3D_IMAGE_COLOR] = + { + .name = "GPU_SHADER_3D_IMAGE_COLOR", + .create_info = "gpu_shader_3D_image_color", + }, [GPU_SHADER_3D_IMAGE_MODULATE_ALPHA] = { .name = "GPU_SHADER_3D_IMAGE_MODULATE_ALPHA", @@ -163,11 +168,6 @@ static const GPUShaderStages builtin_shader_stages[GPU_SHADER_BUILTIN_LEN] = { .name = "GPU_SHADER_2D_IMAGE_OVERLAYS_STEREO_MERGE", .create_info = "gpu_shader_2D_image_overlays_stereo_merge", }, - [GPU_SHADER_2D_IMAGE_COLOR] = - { - .name = "GPU_SHADER_2D_IMAGE_COLOR", - .create_info = "gpu_shader_2D_image_color", - }, [GPU_SHADER_2D_IMAGE_DESATURATE_COLOR] = { .name = "GPU_SHADER_2D_IMAGE_DESATURATE_COLOR", -- cgit v1.2.3