diff options
author | Antonio Vazquez <blendergit@gmail.com> | 2022-02-10 18:59:57 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2022-02-10 18:59:57 +0300 |
commit | a7ae33202fa94a52235fbe595873d81e482d5f58 (patch) | |
tree | c075afc26803edd25de9021d3190d2d9613f741d /intern/cycles/device/device.cpp | |
parent | a5cddaefd344a4ab8c1d5d1be39edf6e6dc456e0 (diff) | |
parent | ad77b52abcbd0daf0d1a3ad395983cb90beeb72a (diff) |
Merge branch 'master' into greasepencil-objectgreasepencil-object
Conflicts:
release/scripts/startup/bl_ui/space_userpref.py
source/blender/blenkernel/BKE_gpencil.h
source/blender/blenkernel/BKE_gpencil_update_cache.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/gpencil.c
source/blender/blenkernel/intern/gpencil_update_cache.c
source/blender/blenlib/BLI_listbase.h
source/blender/blenlib/intern/DLRB_tree.c
source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_gpencil.cc
source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_gpencil.h
source/blender/makesdna/DNA_gpencil_types.h
source/blender/makesrna/intern/rna_gpencil.c
Diffstat (limited to 'intern/cycles/device/device.cpp')
-rw-r--r-- | intern/cycles/device/device.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp index 14c97affb76..4d981e45ff1 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -335,7 +335,7 @@ DeviceInfo Device::get_multi_device(const vector<DeviceInfo> &subdevices, if (device.type == DEVICE_CPU && subdevices.size() > 1) { if (background) { int orig_cpu_threads = (threads) ? threads : TaskScheduler::max_concurrency(); - int cpu_threads = max(orig_cpu_threads - (subdevices.size() - 1), 0); + int cpu_threads = max(orig_cpu_threads - (subdevices.size() - 1), size_t(0)); VLOG(1) << "CPU render threads reduced from " << orig_cpu_threads << " to " << cpu_threads << ", to dedicate to GPU."; |