Commit: 3dead13845057a417cf5c8d198bca9c366b3e4d1 Author: Jeffrey Liu Date: Wed Jun 22 01:42:20 2022 -0400 Branches: soc-2022-many-lights-sampling https://developer.blender.org/rB3dead13845057a417cf5c8d198bca9c366b3e4d1
Cleanup: unused members in light tree struct =================================================================== M intern/cycles/kernel/types.h M intern/cycles/scene/light.cpp M release/scripts/addons =================================================================== diff --git a/intern/cycles/kernel/types.h b/intern/cycles/kernel/types.h index 5a5e1bcc220..474a6966ae5 100644 --- a/intern/cycles/kernel/types.h +++ b/intern/cycles/kernel/types.h @@ -1538,12 +1538,6 @@ typedef struct KernelLightTreeEmitter { /* Energy. */ float energy; - - /* If this is positive, this is a triangle. Otherwise, it's a light source. */ - int prim_id; - - /* Padding. */ - int pad1, pad2, pad3; } KernelLightTreeEmitter; static_assert_align(KernelLightTreeEmitter, 16); diff --git a/intern/cycles/scene/light.cpp b/intern/cycles/scene/light.cpp index e46c76594f4..3035a2e3138 100644 --- a/intern/cycles/scene/light.cpp +++ b/intern/cycles/scene/light.cpp @@ -393,8 +393,6 @@ void LightManager::device_update_distribution(Device *, } light_tree_emitters[index].theta_o = bcone.theta_o; light_tree_emitters[index].theta_e = bcone.theta_e; - - light_tree_emitters[index].prim_id = prim.prim_id; } dscene->light_tree_emitters.copy_to_device(); } diff --git a/release/scripts/addons b/release/scripts/addons index 5902265f1e5..038db9d607b 160000 --- a/release/scripts/addons +++ b/release/scripts/addons @@ -1 +1 @@ -Subproject commit 5902265f1e5aaeca3781ea15f994bdf0b3cb054d +Subproject commit 038db9d607b352f6a7391c5a6b3ab906692c9421 _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs