diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-26 10:34:13 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-26 10:34:13 +0300 |
| commit | ea339dc62c37b891b8b0c0a8e56f7848b3de5fe9 (patch) | |
| tree | b4465742e8e0aad531ab387eb5da950fc51d2c91 /intern/cycles/device | |
| parent | e6825946d057f077f5473366b4fa4d383484a81c (diff) | |
| parent | df237b964b9c24c9ab315f6f31bf67990f1c2f7e (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/device')
| -rw-r--r-- | intern/cycles/device/device_cpu.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp index 6be60f8bbb6..3b0d0fb9806 100644 --- a/intern/cycles/device/device_cpu.cpp +++ b/intern/cycles/device/device_cpu.cpp @@ -21,7 +21,10 @@ #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 "device/device.h" |