diff options
| author | Monique <mdewanchand@atmind.nl> | 2022-09-13 20:08:34 +0300 |
|---|---|---|
| committer | Monique <mdewanchand@atmind.nl> | 2022-09-13 20:08:34 +0300 |
| commit | e449a9bb5e11c07b315f9eb2dcb7de0237f37c02 (patch) | |
| tree | 6a7eeddd3738701a1a8a0b78135965f02d30ccbc /intern/cycles/scene/osl.cpp | |
| parent | 22d1673b927e041838cd49e3d13615365bbdafdd (diff) | |
| parent | 08a8de739d8c7fa60f257ed171d292879edae013 (diff) | |
Merge branch 'master' into temp-T73411-add-scene-parameterstemp-T73411-add-scene-parameters
Diffstat (limited to 'intern/cycles/scene/osl.cpp')
| -rw-r--r-- | intern/cycles/scene/osl.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/intern/cycles/scene/osl.cpp b/intern/cycles/scene/osl.cpp index f0246b5b40e..93839facdbe 100644 --- a/intern/cycles/scene/osl.cpp +++ b/intern/cycles/scene/osl.cpp @@ -17,7 +17,6 @@ # include "kernel/osl/globals.h" # include "kernel/osl/services.h" -# include "kernel/osl/shader.h" # include "util/aligned_malloc.h" # include "util/foreach.h" |