diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2022-02-19 00:29:31 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2022-02-19 00:29:31 +0300 |
| commit | e81dda4f3865827f3b3039caa57d9e97e2019781 (patch) | |
| tree | d399aecda5c8057ea3674d826521b009bd023d46 /source/blender/gpu/intern/gpu_shader_dependency.cc | |
| parent | 7f68185d347b01a75836eb7372181a1196f546aa (diff) | |
| parent | 93cc892470109ab505f00f0b9d2bddb1a0a8179d (diff) | |
Merge branch 'blender-v3.1-release'
# Conflicts:
# intern/opencolorio/ocio_shader_shared.hh
Diffstat (limited to 'source/blender/gpu/intern/gpu_shader_dependency.cc')
| -rw-r--r-- | source/blender/gpu/intern/gpu_shader_dependency.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/source/blender/gpu/intern/gpu_shader_dependency.cc b/source/blender/gpu/intern/gpu_shader_dependency.cc index 5b7df035acd..8a842ef4d7c 100644 --- a/source/blender/gpu/intern/gpu_shader_dependency.cc +++ b/source/blender/gpu/intern/gpu_shader_dependency.cc @@ -21,9 +21,6 @@ extern "C" { #define SHADER_SOURCE(datatoc, filename, filepath) extern char datatoc[]; #include "glsl_draw_source_list.h" #include "glsl_gpu_source_list.h" -#ifdef WITH_OCIO -# include "glsl_ocio_source_list.h" -#endif #undef SHADER_SOURCE } @@ -351,9 +348,6 @@ void gpu_shader_dependency_init() g_sources->add_new(filename, new GPUSource(filepath, filename, datatoc)); #include "glsl_draw_source_list.h" #include "glsl_gpu_source_list.h" -#ifdef WITH_OCIO -# include "glsl_ocio_source_list.h" -#endif #undef SHADER_SOURCE int errors = 0; |