diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2011-01-18 07:32:41 +0300 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2011-01-18 07:32:41 +0300 |
| commit | a1de0fbf1708010f618864f605d602b4e658f329 (patch) | |
| tree | 56fab0d5fbf5a85700595908e1890958a73fa753 /source/blender/editors/interface | |
| parent | c2a638a81e93f3183b3fdec2652aff1d2bde9ac9 (diff) | |
Small fix for my last fix: ignore the `preview' flag; if either size
has been marked for update then do it regardless. Otherwise changing
the texture type doesn't always update the brush texture preview.
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_icons.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index df4ab336334..bd793538f50 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -1001,7 +1001,7 @@ static void icon_draw_size(float x, float y, int icon_id, float aspect, float al } } -void ui_id_icon_render(bContext *C, ID *id, int preview) +void ui_id_icon_render(bContext *C, ID *id, int UNUSED(preview)) { PreviewImage *pi = BKE_previewimg_get(id); int i; @@ -1013,8 +1013,7 @@ void ui_id_icon_render(bContext *C, ID *id, int preview) /* check if preview rect needs to be created; changed only set by dynamic icons */ if((pi->changed[i] || !pi->rect[i])) { - if(i == 0 || preview) - icon_set_image(C, id, pi, i); + icon_set_image(C, id, pi, i); pi->changed[i] = 0; } } |