diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2016-11-02 12:48:06 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2016-11-02 12:59:52 +0300 |
| commit | a41bbd3053c8f07c24ccb07eaeff09cc078cc4d4 (patch) | |
| tree | aed76b27fa7b6fde5023b6d3ecd5f5079ed24aad /source/blender/editors/interface/interface_icons.c | |
| parent | fb6f42dc4f0dc24a992a631b7aac3290449e815a (diff) | |
| parent | 13ee9b8ebe08ee95478f51537f10e9a1b1e4d863 (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'source/blender/editors/interface/interface_icons.c')
| -rw-r--r-- | source/blender/editors/interface/interface_icons.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index f82ed82a922..02812f6a842 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -1087,7 +1087,7 @@ void ui_icon_ensure_deferred(const bContext *C, const int icon_id, const bool bi if (prv) { const int size = big ? ICON_SIZE_PREVIEW : ICON_SIZE_ICON; - if (id || prv->use_deferred) { + if (id || (prv->tag & PRV_TAG_DEFFERED) != 0) { ui_id_preview_image_render_size(C, NULL, id, prv, size, true); } } |