diff options
| author | Sam Kottler <dev@samkottler.net> | 2020-07-02 18:24:15 +0300 |
|---|---|---|
| committer | Sam Kottler <dev@samkottler.net> | 2020-07-02 18:24:15 +0300 |
| commit | 5f124b0838d4c4768e5cfd44edeefdc9a591eec6 (patch) | |
| tree | c280f77087059e0a89f914d2d946618115ad2f86 | |
| parent | 5a3f8a6067d12e1965ed9875a448c74607af49ca (diff) | |
Decoupled splitting from branched path integrator.
| -rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 7 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernel_path_surface.h | 3 | ||||
| m--------- | release/datafiles/locale | 0 | ||||
| m--------- | release/scripts/addons | 0 | ||||
| m--------- | release/scripts/addons_contrib | 0 |
5 files changed, 2 insertions, 8 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index bfadc861c77..4eb9b9d49fa 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -292,12 +292,7 @@ void BlenderSync::sync_integrator() cscene, "progressive", Integrator::NUM_METHODS, Integrator::PATH); integrator->use_light_tree = get_boolean(cscene, "use_light_tree"); - if (get_enum(cscene, "progressive") == 0) { - integrator->splitting_threshold = get_float(cscene, "splitting_threshold"); - } - else { // Not using branched path tracing - integrator->splitting_threshold = 0.0f; - } + integrator->splitting_threshold = get_float(cscene, "splitting_threshold"); integrator->sample_all_lights_direct = get_boolean(cscene, "sample_all_lights_direct"); integrator->sample_all_lights_indirect = get_boolean(cscene, "sample_all_lights_indirect"); integrator->light_sampling_threshold = get_float(cscene, "light_sampling_threshold"); diff --git a/intern/cycles/kernel/kernel_path_surface.h b/intern/cycles/kernel/kernel_path_surface.h index 09672f542da..f8bc9fd7240 100644 --- a/intern/cycles/kernel/kernel_path_surface.h +++ b/intern/cycles/kernel/kernel_path_surface.h @@ -242,8 +242,7 @@ ccl_device_noinline_cpu void kernel_branched_path_surface_connect_light( BsdfEval L_light ccl_optional_struct_init; bool use_light_tree = kernel_data.integrator.use_light_tree; - bool use_splitting = kernel_data.integrator.splitting_threshold != 0.0f; - if (use_light_tree && use_splitting) { + if (use_light_tree) { Ray light_ray; bool is_lamp; diff --git a/release/datafiles/locale b/release/datafiles/locale -Subproject 72e5040232a544b293dca05dac5707bd4e4bffa +Subproject f1ab6e28bf1626daf898fc65e144f1e4e4f2098 diff --git a/release/scripts/addons b/release/scripts/addons -Subproject ca6405bac34ebf2122bd37a5ad40c03b4bb30f3 +Subproject f1f69a63e0fb0f3079a9895e34aa56ae9b07078 diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib -Subproject 7c36b48507f79ca62f8c038bad0fb3468c4f48e +Subproject 45aa940dabda64f7877c6d5dd843998a86f0a83 |