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

Merge branch 'master' into blender2.8

This commit is contained in:
Bastien Montagne 2018-05-11 10:49:58 +02:00
parent bcb245bd71 13beeb5892
commit d19c8605f8
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -564,8 +564,12 @@ static int icon_id_ensure_create_icon(struct ID *id)
int BKE_icon_id_ensure(struct ID *id)
{
if (!id || G.background)
/* Never handle icons in non-main thread! */
BLI_assert(BLI_thread_is_main());
if (!id || G.background) {
return 0;
}
if (id->icon_id)
return id->icon_id;

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

@ -3129,9 +3129,11 @@ static void image_create_multilayer(Image *ima, ImBuf *ibuf, int framenr)
/* common stuff to do with images after loading */
static void image_initialize_after_load(Image *ima, ImBuf *ibuf)
{
/* preview is NULL when it has never been used as an icon before */
if (G.background == 0 && ima->preview == NULL)
/* Preview is NULL when it has never been used as an icon before.
* Never handle previews/icons outside of main thread. */
if (G.background == 0 && ima->preview == NULL && BLI_thread_is_main()) {
BKE_icon_changed(BKE_icon_id_ensure(&ima->id));
}
/* fields */
if (ima->flag & IMA_FIELDS) {