nrupsis/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

me-main #1

Merged
Nate Rupsis merged 123 commits from me-main into main 2023-02-13 18:39:11 +01:00
Conversation 0 Commits 123 Files Changed 969 +1 -1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a1282ab015 - Show all commits

2
intern/cycles/device/device.cpp
View File

@ -648,7 +648,7 @@ GPUDevice::Mem *GPUDevice::generic_alloc(device_memory &mem, size_t pitch_paddin
} }
if (mem_alloc_result) { if (mem_alloc_result) {
assert(transform_host_pointer(&device_pointer, shared_pointer)); assert(transform_host_pointer(device_pointer, shared_pointer));
map_host_used += size; map_host_used += size;
status = " in host memory"; status = " in host memory";
} }