From 13beeb58922747cc1a28bac58ceb1b44820808cd Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Fri, 11 May 2018 10:48:04 +0200 Subject: Fix (unreported) load image code calling icin/preview update from non-Main thread. Icin/preview only works in main thread, while image loading can be done from others too... This could have generated random crashes and such. --- source/blender/blenkernel/intern/icons.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source/blender/blenkernel/intern/icons.c') diff --git a/source/blender/blenkernel/intern/icons.c b/source/blender/blenkernel/intern/icons.c index 3ac8abd55f6..9483543f1f0 100644 --- a/source/blender/blenkernel/intern/icons.c +++ b/source/blender/blenkernel/intern/icons.c @@ -514,8 +514,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; -- cgit v1.2.3