diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-01-03 15:44:47 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-03 15:44:47 +0300 |
commit | be403891652a375e5a0ac61b493342ca6d39afb7 (patch) | |
tree | ef9637103db6d66c4b311cba5b705d575562a1f8 /intern/cycles/device/device_memory.cpp | |
parent | 060fdb49d64857ff1cbf9937420ed70b10b17086 (diff) | |
parent | cbc7aa80d49e3b36c9ecc0e27ec528b34c491fc1 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/device/device_memory.cpp')
-rw-r--r-- | intern/cycles/device/device_memory.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/intern/cycles/device/device_memory.cpp b/intern/cycles/device/device_memory.cpp index 3ad0946330b..82598007a59 100644 --- a/intern/cycles/device/device_memory.cpp +++ b/intern/cycles/device/device_memory.cpp @@ -35,7 +35,8 @@ device_memory::device_memory(Device *device, const char *name, MemoryType type) extension(EXTENSION_REPEAT), device(device), device_pointer(0), - host_pointer(0) + host_pointer(0), + shared_pointer(0) { } @@ -86,7 +87,7 @@ void device_memory::device_free() void device_memory::device_copy_to() { - if(data_size) { + if(host_pointer) { device->mem_copy_to(*this); } } |