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 06b43213b7 - Show all commits

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

@ -39,7 +39,7 @@ CCL_NAMESPACE_BEGIN
*/
bool Scene::check_cancel_update(Progress &progress, Device *device) {
bool status = false;
if (!background && progress.get_updates()) {
if (progress.get_updates()) {
status = progress.get_cancel();
}
return status || ((device != NULL) && device->have_error());