griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.2-release'

Browse Source
This commit is contained in:
Weizhen Huang
2024-06-13 16:03:31 +02:00
parent b0e92cfba6 e639c3d6e2
commit 5bb7dc82ae
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
intern/cycles/scene/light.cpp
View File

@@ -287,6 +287,10 @@ void LightManager::device_update_distribution(Device *,
Progress &progress)
{
KernelIntegrator *kintegrator = &dscene->data.integrator;
if (kintegrator->use_light_tree) {
dscene->light_distribution.free();
return;
}
/* Update CDF over lights. */
progress.set_status("Updating Lights", "Computing distribution");
@@ -294,6 +298,8 @@ void LightManager::device_update_distribution(Device *,
/* Counts emissive triangles in the scene. */
size_t num_triangles = 0;
const int num_lights = kintegrator->num_lights;
const size_t max_num_triangles = std::numeric_limits<int>::max() - 1 - kintegrator->num_lights;
foreach (Object *object, scene->objects) {
if (progress.get_cancel()) {
return;
@@ -317,19 +323,19 @@ void LightManager::device_update_distribution(Device *,
num_triangles++;
}
}
if (num_triangles > max_num_triangles) {
progress.set_error(
"Number of emissive triangles exceeds the limit, consider using Light Tree or disabling "
"Emission Sampling on some emissive materials");
}
}
const size_t num_lights = kintegrator->num_lights;
const size_t num_distribution = num_triangles + num_lights;
/* Distribution size. */
kintegrator->num_distribution = num_distribution;
if (kintegrator->use_light_tree) {
dscene->light_distribution.free();
return;
}
VLOG_INFO << "Use light distribution with " << num_distribution << " emitters.";
/* Emission area. */