diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2015-10-21 18:30:35 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2015-10-21 18:30:35 +0300 |
| commit | 0775680e4d05eda3c495a56dc0b6eafbe96dc586 (patch) | |
| tree | 4f3286eef96dec6ababe43467ed2a4f50388b988 /source/blender/imbuf/IMB_thumbs.h | |
| parent | 4ade467fc6adfc13ce9e21d7e50b366fce70ea5f (diff) | |
| parent | 6bc007610263c879f6bb30b844ba9d9a0fb9433c (diff) | |
Merge branch 'master' into UI-graphical-redesignUI-graphical-redesign
Conflicts:
source/blender/blenkernel/BKE_blender.h
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/resources.c
Diffstat (limited to 'source/blender/imbuf/IMB_thumbs.h')
| -rw-r--r-- | source/blender/imbuf/IMB_thumbs.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/imbuf/IMB_thumbs.h b/source/blender/imbuf/IMB_thumbs.h index f2f75973bcd..6ca4b919c1d 100644 --- a/source/blender/imbuf/IMB_thumbs.h +++ b/source/blender/imbuf/IMB_thumbs.h @@ -63,7 +63,7 @@ typedef enum ThumbSource { #define PREVIEW_RENDER_DEFAULT_HEIGHT 128 -/* Note this can also be used as versionning system, +/* Note this can also be used as versioning system, * to force refreshing all thumbnails if e.g. we change some thumb generating code or so. * Only used by fonts so far. */ #define THUMB_DEFAULT_HASH "00000000000000000000000000000000" @@ -84,13 +84,19 @@ ImBuf *IMB_thumb_manage(const char *path, ThumbSize size, ThumbSource source); void IMB_thumb_makedirs(void); /* special function for loading a thumbnail embedded into a blend file */ -ImBuf *IMB_thumb_load_blend(const char *path); +ImBuf *IMB_thumb_load_blend(const char *blen_path, const char *blen_group, const char *blen_id); void IMB_thumb_overlay_blend(unsigned int *thumb, int width, int height, float aspect); /* special function for previewing fonts */ ImBuf *IMB_thumb_load_font(const char *filename, unsigned int x, unsigned int y); bool IMB_thumb_load_font_get_hash(char *r_hash); +/* Threading */ +void IMB_thumb_locks_acquire(void); +void IMB_thumb_locks_release(void); +void IMB_thumb_path_lock(const char *path); +void IMB_thumb_path_unlock(const char *path); + #ifdef __cplusplus } #endif /* __cplusplus */ |