diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-10-24 13:19:48 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-10-24 13:19:48 +0300 |
| commit | 7ea7fd45d0fffed5cc67769a9fe050ae6a574554 (patch) | |
| tree | 032b450cf6ee9d9a40c8f307305df1eff350266e /intern/cycles/render | |
| parent | f5456df095291c6cb2d0223a179746c8e514cd15 (diff) | |
| parent | e03df90bf36f907a99ebd8cba6cf03cf05ca71a3 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/render')
| -rw-r--r-- | intern/cycles/render/buffers.cpp | 3 | ||||
| -rw-r--r-- | intern/cycles/render/buffers.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/intern/cycles/render/buffers.cpp b/intern/cycles/render/buffers.cpp index 9ad465c3452..70912ca8e87 100644 --- a/intern/cycles/render/buffers.cpp +++ b/intern/cycles/render/buffers.cpp @@ -115,7 +115,8 @@ RenderTile::RenderTile() /* Render Buffers */ RenderBuffers::RenderBuffers(Device *device) -: buffer(device, "RenderBuffers", MEM_READ_WRITE) +: buffer(device, "RenderBuffers", MEM_READ_WRITE), + map_neighbor_copied(false) { } diff --git a/intern/cycles/render/buffers.h b/intern/cycles/render/buffers.h index 8563d6674ec..9fa0cdd4e27 100644 --- a/intern/cycles/render/buffers.h +++ b/intern/cycles/render/buffers.h @@ -74,6 +74,7 @@ public: /* float buffer */ device_vector<float> buffer; + bool map_neighbor_copied; explicit RenderBuffers(Device *device); ~RenderBuffers(); |