diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-06-26 18:42:33 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-06-26 18:42:33 +0300 |
| commit | b4c01aca30faa16900084c081faff6fbaf130872 (patch) | |
| tree | 51e66b197e1706b22fd6b832c4a223ebdfb1b375 /intern/cycles/render/shader.h | |
| parent | d5a42bce38fd6548728b47a4ec76afdd75668341 (diff) | |
| parent | 599e979d90327c1e10031f992cb2be2cda414825 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/render/shader.h')
| -rw-r--r-- | intern/cycles/render/shader.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/intern/cycles/render/shader.h b/intern/cycles/render/shader.h index 87bc3ddda28..d787c3b266b 100644 --- a/intern/cycles/render/shader.h +++ b/intern/cycles/render/shader.h @@ -20,10 +20,7 @@ #ifdef WITH_OSL /* So no context pollution happens from indirectly included windows.h */ # include "util/util_windows.h" -# pragma clang diagnostic push -# pragma clang diagnostic ignored "-Wdeprecated-register" # include <OSL/oslexec.h> -# pragma clang diagnostic pop #endif #include "render/attribute.h" |