diff options
author | Jacques Lucke <jacques@blender.org> | 2021-06-14 13:44:13 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2021-06-14 13:44:13 +0300 |
commit | dddcf1e9bbf4a6d1f4ff03eaf0cb7e9228b18ec5 (patch) | |
tree | c20defa7efd54c933d20a296abefe567909bb6c0 /source/blender/gpu/intern/gpu_material_library.c | |
parent | 3b162b7c185d089e93d892169a458d552196b7b6 (diff) | |
parent | c9dc55301cd7903b7ef7c045d337ada29aa809a1 (diff) |
Merge branch 'master' into temp-compact-node-prototypetemp-compact-node-prototype
Diffstat (limited to 'source/blender/gpu/intern/gpu_material_library.c')
-rw-r--r-- | source/blender/gpu/intern/gpu_material_library.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/gpu/intern/gpu_material_library.c b/source/blender/gpu/intern/gpu_material_library.c index 175facc0a8d..3c216c1a991 100644 --- a/source/blender/gpu/intern/gpu_material_library.c +++ b/source/blender/gpu/intern/gpu_material_library.c @@ -47,6 +47,7 @@ extern char datatoc_gpu_shader_material_anisotropic_glsl[]; extern char datatoc_gpu_shader_material_attribute_glsl[]; extern char datatoc_gpu_shader_material_background_glsl[]; extern char datatoc_gpu_shader_material_bevel_glsl[]; +extern char datatoc_gpu_shader_material_wavelength_glsl[]; extern char datatoc_gpu_shader_material_blackbody_glsl[]; extern char datatoc_gpu_shader_material_bright_contrast_glsl[]; extern char datatoc_gpu_shader_material_bump_glsl[]; @@ -191,6 +192,11 @@ static GPUMaterialLibrary gpu_shader_material_bevel_library = { .dependencies = {NULL}, }; +static GPUMaterialLibrary gpu_shader_material_wavelength_library = { + .code = datatoc_gpu_shader_material_wavelength_glsl, + .dependencies = {NULL}, +}; + static GPUMaterialLibrary gpu_shader_material_blackbody_library = { .code = datatoc_gpu_shader_material_blackbody_glsl, .dependencies = {NULL}, @@ -593,6 +599,7 @@ static GPUMaterialLibrary *gpu_material_libraries[] = { &gpu_shader_material_attribute_library, &gpu_shader_material_background_library, &gpu_shader_material_bevel_library, + &gpu_shader_material_wavelength_library, &gpu_shader_material_blackbody_library, &gpu_shader_material_bright_contrast_library, &gpu_shader_material_bump_library, |