diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-13 16:34:26 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-13 16:34:26 +0300 |
commit | 74a3d9b410e671b81b6b41e16dd9b158882521d3 (patch) | |
tree | dd34df2dee0f6b47739434a363504bf20ba31d34 /intern/cycles/device | |
parent | 1bbe770030a93c38e4fd95f4e65009385c33ab34 (diff) | |
parent | 3866161da855d2b35ac48ef55958bcb567d4a740 (diff) |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/device')
-rw-r--r-- | intern/cycles/device/device.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp index 5b53dc9d937..40d17b7f3d6 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -601,10 +601,10 @@ void Device::tag_update() void Device::free_memory() { devices_initialized_mask = 0; - cuda_devices.clear(); - opencl_devices.clear(); - cpu_devices.clear(); - network_devices.clear(); + cuda_devices.free_memory(); + opencl_devices.free_memory(); + cpu_devices.free_memory(); + network_devices.free_memory(); } CCL_NAMESPACE_END |