From 568dc2665e81902236a619daf385abcf928fb4fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Wed, 4 Nov 2020 19:34:19 +0100 Subject: [PATCH 1/2] Fix T73126 Eevee: light probe baking ignores indirect bounces from SSS --- source/blender/draw/engines/eevee/eevee_lightcache.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/blender/draw/engines/eevee/eevee_lightcache.c b/source/blender/draw/engines/eevee/eevee_lightcache.c index 4904f34a00b..b515ea9c625 100644 --- a/source/blender/draw/engines/eevee/eevee_lightcache.c +++ b/source/blender/draw/engines/eevee/eevee_lightcache.c @@ -1058,6 +1058,7 @@ static void eevee_lightbake_render_grid_sample(void *ved, void *user_data) /* Disable specular lighting when rendering probes to avoid feedback loops (looks bad). */ common_data->spec_toggle = false; + common_data->sss_toggle = false; common_data->prb_num_planar = 0; common_data->prb_num_render_cube = 0; common_data->ray_type = EEVEE_RAY_DIFFUSE; @@ -1127,6 +1128,7 @@ static void eevee_lightbake_render_probe_sample(void *ved, void *user_data) /* Disable specular lighting when rendering probes to avoid feedback loops (looks bad). */ common_data->spec_toggle = false; + common_data->sss_toggle = false; common_data->prb_num_planar = 0; common_data->prb_num_render_cube = 0; common_data->ray_type = EEVEE_RAY_GLOSSY; From 29780b8101eb7fa14a8729ff2cd7b73ef4e84c5a Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Wed, 4 Nov 2020 13:21:26 -0600 Subject: [PATCH 2/2] Remove incorrect assert in button group code Even after the last commit to fix this assert, it still fails in the case where a button was added before there was a button group added to the block. Another fix for this would be to always create a button group in UI_block_begin, but this assert has no particular purpose, so it's simpler to just remove it. --- source/blender/editors/interface/interface_button_group.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/source/blender/editors/interface/interface_button_group.c b/source/blender/editors/interface/interface_button_group.c index 3d82b84399c..2d2da9a4d14 100644 --- a/source/blender/editors/interface/interface_button_group.c +++ b/source/blender/editors/interface/interface_button_group.c @@ -86,9 +86,6 @@ void ui_button_group_replace_but_ptr(uiBlock *block, const void *old_but_ptr, ui } } } - - /* The button should be in a group, otherwise there are no button groups at all. */ - BLI_assert(BLI_listbase_is_empty(&block->button_groups)); } /** \} */