diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-19 13:53:21 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-19 13:53:21 +0300 |
| commit | 9d6a175756c8db989fc95bae47bbd1e77ff07980 (patch) | |
| tree | c60ad0c6318ac38cba576da2bfd3b792be787a1c /source/blender/blenkernel/intern/icons.c | |
| parent | 0a679c6b685a4a046a9c4074cff8c508d6f91618 (diff) | |
| parent | da82269c58bd7ec1c0ebcb5e1433c731120ec389 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/icons.c')
| -rw-r--r-- | source/blender/blenkernel/intern/icons.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/icons.c b/source/blender/blenkernel/intern/icons.c index 25a3675896b..7cf7bb7452a 100644 --- a/source/blender/blenkernel/intern/icons.c +++ b/source/blender/blenkernel/intern/icons.c @@ -477,7 +477,7 @@ void BKE_icon_changed(const int icon_id) if (icon) { /* We *only* expect ID-tied icons here, not non-ID icon/preview! */ - BLI_assert(icon->type != 0); + BLI_assert(icon->id_type != 0); /* Do not enforce creation of previews for valid ID types using BKE_previewimg_id_ensure() here , * we only want to ensure *existing* preview images are properly tagged as changed/invalid, that's all. */ @@ -503,7 +503,7 @@ static int icon_id_ensure_create_icon(struct ID *id) new_icon = MEM_mallocN(sizeof(Icon), __func__); new_icon->obj = id; - new_icon->type = GS(id->name); + new_icon->id_type = GS(id->name); /* next two lines make sure image gets created */ new_icon->drawinfo = NULL; @@ -579,7 +579,7 @@ int BKE_icon_preview_ensure(ID *id, PreviewImage *preview) new_icon = MEM_mallocN(sizeof(Icon), __func__); new_icon->obj = preview; - new_icon->type = 0; /* Special, tags as non-ID icon/preview. */ + new_icon->id_type = 0; /* Special, tags as non-ID icon/preview. */ /* next two lines make sure image gets created */ new_icon->drawinfo = NULL; @@ -656,7 +656,7 @@ void BKE_icon_delete(const int icon_id) icon = BLI_ghash_popkey(gIcons, SET_INT_IN_POINTER(icon_id), NULL); if (icon) { - if (icon->type) { + if (icon->id_type != 0) { ((ID *)(icon->obj))->icon_id = 0; } else { |