blender
/
blender
136
413
Fork 596
Code Issues 6.3k Pull Requests 771 Projects 19 Wiki Activity

Alternative Upload geometry data in parallel to multiple GPUs using the "Multi-Device" #107552

Open
William Leeson wants to merge 137 commits from leesonw/blender-cluster:upload_changed into main
pull from: leesonw/blender-cluster:upload_changed
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 2 Commits 137 Files Changed 43 +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 674721194e - Show all commits

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

@ -57,7 +57,7 @@ class MultiDevice : public Device {
/* Swop the CPU device with the last device to ensure the CPU device is the last */
{
int last = devices.size() - 1;
if (cpu_device_idx != last) {
if ((cpu_device_idx != -1) && (cpu_device_idx != last)) {
std::swap(devices[last], devices[cpu_device_idx]);
}
}