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 | |
parent | d5a42bce38fd6548728b47a4ec76afdd75668341 (diff) | |
parent | 599e979d90327c1e10031f992cb2be2cda414825 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/device/device_cpu.cpp | 3 | ||||
-rw-r--r-- | intern/cycles/kernel/osl/osl_closures.cpp | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/osl/osl_shader.cpp | 3 | ||||
-rw-r--r-- | intern/cycles/render/shader.h | 3 | ||||
-rw-r--r-- | intern/cycles/util/util_image.h | 4 | ||||
-rw-r--r-- | intern/cycles/util/util_param.h | 4 |
6 files changed, 0 insertions, 21 deletions
diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp index 3b0d0fb9806..6be60f8bbb6 100644 --- a/intern/cycles/device/device_cpu.cpp +++ b/intern/cycles/device/device_cpu.cpp @@ -21,10 +21,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 "device/device.h" diff --git a/intern/cycles/kernel/osl/osl_closures.cpp b/intern/cycles/kernel/osl/osl_closures.cpp index e928006e41a..6a1e52d7d16 100644 --- a/intern/cycles/kernel/osl/osl_closures.cpp +++ b/intern/cycles/kernel/osl/osl_closures.cpp @@ -30,12 +30,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-register" -#pragma clang diagnostic ignored "-Wexpansion-to-defined" #include <OSL/genclosure.h> #include <OSL/oslclosure.h> -#pragma clang diagnostic pop #include "kernel/osl/osl_closures.h" #include "kernel/osl/osl_shader.h" diff --git a/intern/cycles/kernel/osl/osl_shader.cpp b/intern/cycles/kernel/osl/osl_shader.cpp index 8757b9a748b..b7d1c629291 100644 --- a/intern/cycles/kernel/osl/osl_shader.cpp +++ b/intern/cycles/kernel/osl/osl_shader.cpp @@ -14,10 +14,7 @@ * limitations under the License. */ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-register" #include <OSL/oslexec.h> -#pragma clang diagnostic pop #include "kernel/kernel_compat_cpu.h" #include "kernel/kernel_montecarlo.h" 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" diff --git a/intern/cycles/util/util_image.h b/intern/cycles/util/util_image.h index 38694c87d0e..18876841b5b 100644 --- a/intern/cycles/util/util_image.h +++ b/intern/cycles/util/util_image.h @@ -19,11 +19,7 @@ /* OpenImageIO is used for all image file reading and writing. */ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-register" -#pragma clang diagnostic ignored "-Wexpansion-to-defined" #include <OpenImageIO/imageio.h> -#pragma clang diagnostic pop #include "util/util_vector.h" diff --git a/intern/cycles/util/util_param.h b/intern/cycles/util/util_param.h index 419a8010d5a..69bcbf80a78 100644 --- a/intern/cycles/util/util_param.h +++ b/intern/cycles/util/util_param.h @@ -20,13 +20,9 @@ /* Parameter value lists from OpenImageIO are used to store custom properties * on various data, which can then later be used in shaders. */ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-register" -#pragma clang diagnostic ignored "-Wexpansion-to-defined" #include <OpenImageIO/paramlist.h> #include <OpenImageIO/typedesc.h> #include <OpenImageIO/ustring.h> -#pragma clang diagnostic pop CCL_NAMESPACE_BEGIN |