[Bf-blender-cvs] [f93823e9d4f] cycles_path_guiding: Merge branch 'master' into cycles_path_guiding

[Sebastian Herholz]

Commit: f93823e9d4f1cffd85701a90a9484c469672be37
Author: Sebastian Herholz
Date:   Thu Oct 6 10:27:42 2022 +0200
Branches: cycles_path_guiding
https://developer.blender.org/rBf93823e9d4f1cffd85701a90a9484c469672be37

Merge branch 'master' into cycles_path_guiding

# Conflicts:
#	build_files/build_environment/cmake/harvest.cmake
#	intern/cycles/cmake/external_libs.cmake
#	intern/cycles/integrator/path_trace.cpp
#	intern/cycles/integrator/path_trace_work_cpu.h
#	intern/cycles/kernel/integrator/guiding.h
#	intern/cycles/kernel/integrator/state_template.h
#	intern/cycles/kernel/integrator/volume_shader.h

===================================================================



===================================================================