[Bf-blender-cvs] [2b1345d347f] asset-metadata: Merge branch 'master' into asset-metadata

[Julian Eisel]

Commit: 2b1345d347f67d4b6aae8b5a4467cee1dbebfac7
Author: Julian Eisel
Date:   Tue Sep 22 17:33:30 2020 +0200
Branches: asset-metadata
https://developer.blender.org/rB2b1345d347f67d4b6aae8b5a4467cee1dbebfac7

Merge branch 'master' into asset-metadata

===================================================================



===================================================================

diff --cc source/blender/editors/interface/interface_icons.c
index 27d545ecbc4,b89f7a60ae1..5173ded4157
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@@ -1971,8 -1963,13 +1963,8 @@@ static void ui_id_icon_render(const bCo
      return;
    }
  
-   for (i = 0; i < NUM_ICON_SIZES; i++) {
+   for (enum eIconSizes i = 0; i < NUM_ICON_SIZES; i++) {
 -    /* check if rect needs to be created; changed
 -     * only set by dynamic icons */
 -    if (((pi->flag[i] & PRV_CHANGED) || !pi->rect[i])) {
 -      icon_set_image(C, NULL, id, pi, i, use_jobs);
 -      pi->flag[i] &= ~PRV_CHANGED;
 -    }
 +    ui_id_preview_image_render_size(C, NULL, id, pi, i, use_jobs);
    }
  }