blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 781 Projects 19 Wiki Activity

Merge branch 'blender-v2.91-release'

This commit is contained in:
Hans Goudey 2020-11-04 13:27:13 -06:00
parent eb21222e64 29780b8101
commit 10914987a2
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/draw/engines/eevee/eevee_lightcache.c
View File

@ -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;

3
source/blender/editors/interface/interface_button_group.c
View File

@ -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));
}
/** \} */