diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-12 18:49:30 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-12 22:11:38 +0300 |
| commit | 51812fb502c0a3034055df2c7b80e77dba5e91c3 (patch) | |
| tree | 338ef5e0a1c4fa795f26362dd32fe80b2065bbbd /source/blender/blenkernel/BKE_icons.h | |
| parent | 5fae2503bf7d81b89f68f4c494f4c0e4c9eb5f46 (diff) | |
Fix 48831, Step I: Mismatch issues bewteen ID icon and preview system.
- icon_id from ID and PreviewImage were not guaranteed to be in sync.
- PreviewImage one was not reset on file read.
- Through RNA e.g., it was possible to ensure an ID icon via its preview image,
which was running code designed for custom previews/icons system, instead
of generating correct 'auto ID icon'.
Diffstat (limited to 'source/blender/blenkernel/BKE_icons.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_icons.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_icons.h b/source/blender/blenkernel/BKE_icons.h index 763a3874d4e..7839b9e2154 100644 --- a/source/blender/blenkernel/BKE_icons.h +++ b/source/blender/blenkernel/BKE_icons.h @@ -55,7 +55,7 @@ void BKE_icons_init(int first_dyn_id); /* return icon id for library object or create new icon if not found */ int BKE_icon_id_ensure(struct ID *id); -int BKE_icon_preview_ensure(struct PreviewImage *preview); +int BKE_icon_preview_ensure(struct ID *id, struct PreviewImage *preview); /* retrieve icon for id */ struct Icon *BKE_icon_get(int icon_id); |