diff options
Diffstat (limited to 'source/blender/blenkernel/intern/icons.c')
| -rw-r--r-- | source/blender/blenkernel/intern/icons.c | 6 |
1 files changed, 5 insertions, 1 deletions
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; |