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

Merge branch 'blender-v3.0-release'

This commit is contained in:
Jacques Lucke 2021-11-09 13:31:33 +01:00
parent 6c24cafecc 45bd98d4cf
commit 41b0820ddd
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/image.c
View File

@ -1323,6 +1323,9 @@ void BKE_image_print_memlist(Main *bmain)
static bool imagecache_check_dirty(ImBuf *ibuf, void *UNUSED(userkey), void *UNUSED(userdata))
{
if (ibuf == NULL) {
return false;
}
return (ibuf->userflags & IB_BITMAPDIRTY) == 0;
}
@ -1366,6 +1369,9 @@ void BKE_image_free_all_textures(Main *bmain)
static bool imagecache_check_free_anim(ImBuf *ibuf, void *UNUSED(userkey), void *userdata)
{
if (ibuf == NULL) {
return true;
}
int except_frame = *(int *)userdata;
return (ibuf->userflags & IB_BITMAPDIRTY) == 0 && (ibuf->index != IMA_NO_INDEX) &&
(except_frame != IMA_INDEX_ENTRY(ibuf->index));

3
source/blender/imbuf/intern/moviecache.c
View File

@ -242,6 +242,9 @@ static int get_item_priority(void *item_v, int default_priority)
static bool get_item_destroyable(void *item_v)
{
MovieCacheItem *item = (MovieCacheItem *)item_v;
if (item->ibuf == NULL) {
return true;
}
/* IB_BITMAPDIRTY means image was modified from inside blender and
* changes are not saved to disk.
*