diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-10-25 11:13:35 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-10-25 11:13:35 +0300 |
commit | 1e107fa5143ad340176b1a84ceb43c8b00532eca (patch) | |
tree | 58bec6266e0f211d7ef7cd4e55af7fb59aa8c3da /intern/cycles/device/device_network.h | |
parent | 8dab90915f37b01e7d0da59d06cadad23330897c (diff) | |
parent | 83877632a37af921d94811f47798c65520974a92 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/device/device_network.h')
-rw-r--r-- | intern/cycles/device/device_network.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/device/device_network.h b/intern/cycles/device/device_network.h index a38d962c0af..b2be7e23147 100644 --- a/intern/cycles/device/device_network.h +++ b/intern/cycles/device/device_network.h @@ -282,7 +282,7 @@ public: /* Can't transfer OpenGL texture over network. */ if(mem.type == MEM_PIXELS) { - mem.type = MEM_WRITE_ONLY; + mem.type = MEM_READ_WRITE; } } |