diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-04-05 17:58:41 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-04-05 17:58:41 +0300 |
| commit | 57329304b061efe756e3a4ce1b828e9a7c7f7030 (patch) | |
| tree | c4a3f9ec01c09314fac7bcb99b437bf0920d19a3 /source/blender/editors | |
| parent | 3eaf77fdd34bd9517b650cabde3574361bdc8d21 (diff) | |
| parent | ea0e2f9bd3849b73a29ef1805988fdb0484bc9d4 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/screen/area.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 3b899a3d302..390098b3ea3 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -66,6 +66,7 @@ #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" +#include "IMB_metadata.h" #include "UI_interface.h" #include "UI_interface_icons.h" @@ -2249,7 +2250,7 @@ static const char *meta_data_list[] = BLI_INLINE bool metadata_is_valid(ImBuf *ibuf, char *r_str, short index, int offset) { - return (IMB_metadata_get_field(ibuf, meta_data_list[index], r_str + offset, MAX_METADATA_STR - offset) && r_str[0]); + return (IMB_metadata_get_field(ibuf->metadata, meta_data_list[index], r_str + offset, MAX_METADATA_STR - offset) && r_str[0]); } static void metadata_draw_imbuf(ImBuf *ibuf, const rctf *rect, int fontid, const bool is_top) |