Merge branch 'blender-v3.0-release'
This commit is contained in:
commit
41b0820ddd
|
@ -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));
|
||||
|
|
|
@ -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.
|
||||
*
|
||||
|
|
Loading…
Reference in New Issue