blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Merge branch 'blender-v2.90-release' into master

This commit is contained in:
Campbell Barton 2020-08-05 16:48:25 +10:00
parent 79cb0105cd fce71a255c
commit 3562978c35
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,6 +203,21 @@ static bool eevee_lightcache_version_check(LightCache *lcache)
}
}
static bool eevee_lightcache_can_be_saved(LightCache *lcache)
{
if (lcache->grid_tx.data) {
if (MEM_allocN_len(lcache->grid_tx.data) >= INT_MAX) {
return false;
}
}
if (lcache->cube_tx.data) {
if (MEM_allocN_len(lcache->cube_tx.data) >= INT_MAX) {
return false;
}
}
return true;
}
static int eevee_lightcache_irradiance_sample_count(LightCache *lcache)
{
int total_irr_samples = 0;
@ -246,6 +261,13 @@ void EEVEE_lightcache_info_update(SceneEEVEE *eevee)
return;
}
if (!eevee_lightcache_can_be_saved(lcache)) {
BLI_strncpy(eevee->light_cache_info,
TIP_("Error: LightCache is too large and will not be saved to disk"),
sizeof(eevee->light_cache_info));
return;
}
char formatted_mem[15];
BLI_str_format_byte_unit(formatted_mem, eevee_lightcache_memsize_get(lcache), false);