diff options
| author | Hans Goudey <h.goudey@me.com> | 2020-11-04 22:27:13 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2020-11-04 22:27:13 +0300 |
| commit | 10914987a2d8652100a385b352ff3d4bb27e24d1 (patch) | |
| tree | 0b3662433e5a0ce082f60941c8da01e52e804566 /source | |
| parent | eb21222e64f4333181d09b675b5505751ff2154c (diff) | |
| parent | 29780b8101eb7fa14a8729ff2cd7b73ef4e84c5a (diff) | |
Merge branch 'blender-v2.91-release'
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_lightcache.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_button_group.c | 3 |
2 files changed, 2 insertions, 3 deletions
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; 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)); } /** \} */ |