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/device/device.cpp | |
| parent | f5456df095291c6cb2d0223a179746c8e514cd15 (diff) | |
| parent | e03df90bf36f907a99ebd8cba6cf03cf05ca71a3 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/device/device.cpp')
| -rw-r--r-- | intern/cycles/device/device.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp index 0c20270ea42..923b9bd45bf 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -240,7 +240,7 @@ void Device::draw_pixels( { const bool use_fallback_shader = (draw_params.bind_display_space_shader_cb == NULL); - assert(mem.type == MEM_PIXELS); + assert(rgba.type == MEM_PIXELS); mem_copy_from(rgba, y, w, h, rgba.memory_elements_size(1)); GLuint texid; |