diff options
author | Julian Eisel <julian@blender.org> | 2021-11-22 23:26:39 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2021-11-22 23:26:39 +0300 |
commit | 456d5e14b841c5feb2a3e145a3d6ab12925c630b (patch) | |
tree | 9b5ce8f60f53275153bf8653d4c3d2c6dd35b7a0 /source/blender/editors/interface | |
parent | 48c2b4012f788b25b3e1ac90f8626560a24987e6 (diff) | |
parent | 481f032f5cbe2cd3c36c9ef516670fd9e06db25f (diff) |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r-- | source/blender/editors/interface/interface_icons.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index d0a7716b4dd..6f119d55d3c 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -2037,11 +2037,22 @@ void UI_icon_render_id( const bContext *C, Scene *scene, ID *id, const enum eIconSizes size, const bool use_job) { PreviewImage *pi = BKE_previewimg_id_ensure(id); - if (pi == NULL) { return; } + /* For objects, first try if a preview can created via the object data. */ + if (GS(id->name) == ID_OB) { + Object *ob = (Object *)id; + if (ED_preview_id_is_supported(ob->data)) { + id = ob->data; + } + } + + if (!ED_preview_id_is_supported(id)) { + return; + } + ui_id_preview_image_render_size(C, scene, id, pi, size, use_job); } |