leesonw/blender-cluster
0
0
Fork 0
forked from blender/blender
Code Pull Requests 2 Activity

Merge latest distributed renderering changes from GHE master-cluster into master-cluster on blender.org #1

Merged
William Leeson merged 13 commits from master-cluster_sync_from_ghe_patch into master-cluster 2023-03-31 17:26:02 +02:00
Conversation 0 Commits 13 Files Changed 77 +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 9e1f8be465 - Show all commits

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

@ -963,7 +963,7 @@ bool OptiXDevice::build_optix_bvh(BVHOptiX *bvh,
// static thread_mutex mutex; // static thread_mutex mutex;
// thread_scoped_lock lock(mutex); // thread_scoped_lock lock(mutex);
//const CUDAContextScope scope(this); const CUDAContextScope scope(this);
//const bool use_fast_trace_bvh = (bvh->params.bvh_type == BVH_TYPE_STATIC); //const bool use_fast_trace_bvh = (bvh->params.bvh_type == BVH_TYPE_STATIC);
// FRL_CGR // FRL_CGR