[Bf-blender-cvs] [950d7ac] ui-preview-buttons: PreviewImage reload: only for 'genuine' icons (i.e. user-modified icons are ignored).
Bastien Montagne
noreply at git.blender.org
Mon May 11 15:15:19 CEST 2015
Commit: 950d7ac3258e4cd8c713442c0833c99ab0ba9d54
Author: Bastien Montagne
Date: Mon May 11 15:14:30 2015 +0200
Branches: ui-preview-buttons
https://developer.blender.org/rB950d7ac3258e4cd8c713442c0833c99ab0ba9d54
PreviewImage reload: only for 'genuine' icons (i.e. user-modified icons are ignored).
===================================================================
M source/blender/makesrna/intern/rna_ID.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c
index 85a20ad..b87b455 100644
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@ -579,8 +579,10 @@ static int rna_ImagePreview_icon_id_get(PointerRNA *ptr)
}
static void rna_ImagePreview_icon_reload(PreviewImage *prv)
{
- /* will lazy load on next use */
- BKE_previewimg_clear(prv);
+ /* will lazy load on next use, but only in case icon is not user-modified! */
+ if (!(prv->flag[ICON_SIZE_ICON] & PRV_USER_EDITED) && !(prv->flag[ICON_SIZE_PREVIEW] & PRV_USER_EDITED)) {
+ BKE_previewimg_clear(prv);
+ }
}
#else
More information about the Bf-blender-cvs
mailing list