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/render | |
| parent | e6825946d057f077f5473366b4fa4d383484a81c (diff) | |
| parent | df237b964b9c24c9ab315f6f31bf67990f1c2f7e (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/render')
| -rw-r--r-- | intern/cycles/render/light.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/render/shader.h | 3 |
2 files changed, 4 insertions, 1 deletions
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" |