Merge branch 'master' into blender2.8

7 files changed, 22 insertions, 1 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"
diff --git a/intern/cycles/kernel/osl/osl_closures.cpp b/intern/cycles/kernel/osl/osl_closures.cpp
index 6a1e52d7d16..e928006e41a 100644
--- a/intern/cycles/kernel/osl/osl_closures.cpp
+++ b/intern/cycles/kernel/osl/osl_closures.cpp
@@ -30,8 +30,12 @@
  * 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 b7d1c629291..8757b9a748b 100644
--- a/intern/cycles/kernel/osl/osl_shader.cpp
+++ b/intern/cycles/kernel/osl/osl_shader.cpp
@@ -14,7 +14,10 @@
  * 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/light.cpp b/intern/cycles/render/light.cpp
index 5a58ef1aa8e..94072d7da09 100644
--- a/intern/cycles/render/light.cpp
+++ b/intern/cycles/render/light.cpp
@@ -587,7 +587,7 @@ void LightManager::device_update_background(Device *device,
 	double time_start = time_dt();
 	if(max(res.x, res.y) < 512) {
 		/* Small enough resolution, faster to do single-threaded. */
-		background_cdf(0, res.x, res.x, res.y, &pixels, cond_cdf);
+		background_cdf(0, res.y, res.x, res.y, &pixels, cond_cdf);
 	}
 	else {
 		/* Threaded evaluation for large resolution. */
diff --git a/intern/cycles/render/shader.h b/intern/cycles/render/shader.h
index d787c3b266b..87bc3ddda28 100644
--- a/intern/cycles/render/shader.h
+++ b/intern/cycles/render/shader.h
@@ -20,7 +20,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 "render/attribute.h"
diff --git a/intern/cycles/util/util_image.h b/intern/cycles/util/util_image.h
index 18876841b5b..38694c87d0e 100644
--- a/intern/cycles/util/util_image.h
+++ b/intern/cycles/util/util_image.h
@@ -19,7 +19,11 @@
 
 /* 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 69bcbf80a78..419a8010d5a 100644
--- a/intern/cycles/util/util_param.h
+++ b/intern/cycles/util/util_param.h
@@ -20,9 +20,13 @@
 /* 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