Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Kottler <dev@samkottler.net>2020-08-13 23:17:04 +0300
committerSam Kottler <dev@samkottler.net>2020-08-13 23:17:04 +0300
commit3b49ca465f708270b69647dc7425958d9e5793c2 (patch)
tree3372b00bcc60433dba499acc4340307189f7ce76 /intern/cycles/blender/blender_sync.cpp
parent7c38d008de5ebdcb96ebdd67b8dc459d5551702f (diff)
Finished bringing light tree code up to date
Diffstat (limited to 'intern/cycles/blender/blender_sync.cpp')
-rw-r--r--intern/cycles/blender/blender_sync.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index f806569c389..7d0c188c5c3 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -305,12 +305,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");