diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/blenkernel/BKE_main.h | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/blenkernel/BKE_main.h')
-rw-r--r-- | source/blender/blenkernel/BKE_main.h | 213 |
1 files changed, 109 insertions, 104 deletions
diff --git a/source/blender/blenkernel/BKE_main.h b/source/blender/blenkernel/BKE_main.h index 12aec58d2a5..84ff46aa5d0 100644 --- a/source/blender/blenkernel/BKE_main.h +++ b/source/blender/blenkernel/BKE_main.h @@ -50,83 +50,83 @@ struct MainLock; /* Blender thumbnail, as written on file (width, height, and data as char RGBA). */ /* We pack pixel data after that struct. */ typedef struct BlendThumbnail { - int width, height; - char rect[0]; + int width, height; + char rect[0]; } BlendThumbnail; /* Structs caching relations between data-blocks in a given Main. */ typedef struct MainIDRelationsEntry { - struct MainIDRelationsEntry *next; - /* WARNING! for user_to_used, that pointer is really an ID** one, but for used_to_user, it’s only an ID* one! */ - struct ID **id_pointer; - int usage_flag; /* Using IDWALK_ enums, in BKE_library_query.h */ + struct MainIDRelationsEntry *next; + /* WARNING! for user_to_used, that pointer is really an ID** one, but for used_to_user, it’s only an ID* one! */ + struct ID **id_pointer; + int usage_flag; /* Using IDWALK_ enums, in BKE_library_query.h */ } MainIDRelationsEntry; typedef struct MainIDRelations { - struct GHash *id_user_to_used; - struct GHash *id_used_to_user; + struct GHash *id_user_to_used; + struct GHash *id_used_to_user; - /* Private... */ - struct BLI_mempool *entry_pool; + /* Private... */ + struct BLI_mempool *entry_pool; } MainIDRelations; typedef struct Main { - struct Main *next, *prev; - char name[1024]; /* 1024 = FILE_MAX */ - short versionfile, subversionfile; /* see BLENDER_VERSION, BLENDER_SUBVERSION */ - short minversionfile, minsubversionfile; - uint64_t build_commit_timestamp; /* commit's timestamp from buildinfo */ - char build_hash[16]; /* hash from buildinfo */ - char recovered; /* indicate the main->name (file) is the recovered one */ - /** All current ID's exist in the last memfile undo step. */ - char is_memfile_undo_written; - - BlendThumbnail *blen_thumb; - - struct Library *curlib; - ListBase scenes; - ListBase libraries; - ListBase objects; - ListBase meshes; - ListBase curves; - ListBase metaballs; - ListBase materials; - ListBase textures; - ListBase images; - ListBase lattices; - ListBase lights; - ListBase cameras; - ListBase ipo; /* Deprecated (only for versioning). */ - ListBase shapekeys; - ListBase worlds; - ListBase screens; - ListBase fonts; - ListBase texts; - ListBase speakers; - ListBase lightprobes; - ListBase sounds; - ListBase collections; - ListBase armatures; - ListBase actions; - ListBase nodetrees; - ListBase brushes; - ListBase particles; - ListBase palettes; - ListBase paintcurves; - ListBase wm; /* Singleton (exception). */ - ListBase gpencils; - ListBase movieclips; - ListBase masks; - ListBase linestyles; - ListBase cachefiles; - ListBase workspaces; - - /* Must be generated, used and freed by same code - never assume this is valid data unless you know - * when, who and how it was created. - * Used by code doing a lot of remapping etc. at once to speed things up. */ - struct MainIDRelations *relations; - - struct MainLock *lock; + struct Main *next, *prev; + char name[1024]; /* 1024 = FILE_MAX */ + short versionfile, subversionfile; /* see BLENDER_VERSION, BLENDER_SUBVERSION */ + short minversionfile, minsubversionfile; + uint64_t build_commit_timestamp; /* commit's timestamp from buildinfo */ + char build_hash[16]; /* hash from buildinfo */ + char recovered; /* indicate the main->name (file) is the recovered one */ + /** All current ID's exist in the last memfile undo step. */ + char is_memfile_undo_written; + + BlendThumbnail *blen_thumb; + + struct Library *curlib; + ListBase scenes; + ListBase libraries; + ListBase objects; + ListBase meshes; + ListBase curves; + ListBase metaballs; + ListBase materials; + ListBase textures; + ListBase images; + ListBase lattices; + ListBase lights; + ListBase cameras; + ListBase ipo; /* Deprecated (only for versioning). */ + ListBase shapekeys; + ListBase worlds; + ListBase screens; + ListBase fonts; + ListBase texts; + ListBase speakers; + ListBase lightprobes; + ListBase sounds; + ListBase collections; + ListBase armatures; + ListBase actions; + ListBase nodetrees; + ListBase brushes; + ListBase particles; + ListBase palettes; + ListBase paintcurves; + ListBase wm; /* Singleton (exception). */ + ListBase gpencils; + ListBase movieclips; + ListBase masks; + ListBase linestyles; + ListBase cachefiles; + ListBase workspaces; + + /* Must be generated, used and freed by same code - never assume this is valid data unless you know + * when, who and how it was created. + * Used by code doing a lot of remapping etc. at once to speed things up. */ + struct MainIDRelations *relations; + + struct MainLock *lock; } Main; struct Main *BKE_main_new(void); @@ -142,40 +142,44 @@ struct GSet *BKE_main_gset_create(struct Main *bmain, struct GSet *gset); /* *** Generic utils to loop over whole Main database. *** */ -#define FOREACH_MAIN_LISTBASE_ID_BEGIN(_lb, _id) \ - { \ - ID *_id_next = _lb->first; \ - for (_id = _id_next; _id != NULL; _id = _id_next) { \ - _id_next = _id->next; - -#define FOREACH_MAIN_LISTBASE_ID_END \ - } \ - } ((void)0) - -#define FOREACH_MAIN_LISTBASE_BEGIN(_bmain, _lb) \ - { \ - ListBase *_lbarray[MAX_LIBARRAY]; \ - int _i = set_listbasepointers(_bmain, _lbarray); \ - while (_i--) { \ - _lb = _lbarray[_i]; - -#define FOREACH_MAIN_LISTBASE_END \ - } \ - } ((void)0) +#define FOREACH_MAIN_LISTBASE_ID_BEGIN(_lb, _id) \ + { \ + ID *_id_next = _lb->first; \ + for (_id = _id_next; _id != NULL; _id = _id_next) { \ + _id_next = _id->next; + +#define FOREACH_MAIN_LISTBASE_ID_END \ + } \ + } \ + ((void)0) + +#define FOREACH_MAIN_LISTBASE_BEGIN(_bmain, _lb) \ + { \ + ListBase *_lbarray[MAX_LIBARRAY]; \ + int _i = set_listbasepointers(_bmain, _lbarray); \ + while (_i--) { \ + _lb = _lbarray[_i]; + +#define FOREACH_MAIN_LISTBASE_END \ + } \ + } \ + ((void)0) /* DO NOT use break statement with that macro, use FOREACH_MAIN_LISTBASE and FOREACH_MAIN_LISTBASE_ID instead * if you need that kind of control flow. */ -#define FOREACH_MAIN_ID_BEGIN(_bmain, _id) \ - { \ - ListBase *_lb; \ - FOREACH_MAIN_LISTBASE_BEGIN(_bmain, _lb) { \ - FOREACH_MAIN_LISTBASE_ID_BEGIN(_lb, _id) - -#define FOREACH_MAIN_ID_END \ - FOREACH_MAIN_LISTBASE_ID_END; \ - } FOREACH_MAIN_LISTBASE_END; \ - } ((void)0) - +#define FOREACH_MAIN_ID_BEGIN(_bmain, _id) \ + { \ + ListBase *_lb; \ + FOREACH_MAIN_LISTBASE_BEGIN(_bmain, _lb) \ + { \ + FOREACH_MAIN_LISTBASE_ID_BEGIN(_lb, _id) + +#define FOREACH_MAIN_ID_END \ + FOREACH_MAIN_LISTBASE_ID_END; \ + } \ + FOREACH_MAIN_LISTBASE_END; \ + } \ + ((void)0) struct BlendThumbnail *BKE_main_thumbnail_from_imbuf(struct Main *bmain, struct ImBuf *img); struct ImBuf *BKE_main_thumbnail_to_imbuf(struct Main *bmain, struct BlendThumbnail *data); @@ -186,26 +190,27 @@ const char *BKE_main_blendfile_path_from_global(void); struct ListBase *which_libbase(struct Main *mainlib, short type); -#define MAX_LIBARRAY 37 +#define MAX_LIBARRAY 37 int set_listbasepointers(struct Main *main, struct ListBase *lb[MAX_LIBARRAY]); #define MAIN_VERSION_ATLEAST(main, ver, subver) \ - ((main)->versionfile > (ver) || (main->versionfile == (ver) && (main)->subversionfile >= (subver))) + ((main)->versionfile > (ver) || \ + (main->versionfile == (ver) && (main)->subversionfile >= (subver))) #define MAIN_VERSION_OLDER(main, ver, subver) \ - ((main)->versionfile < (ver) || (main->versionfile == (ver) && (main)->subversionfile < (subver))) + ((main)->versionfile < (ver) || \ + (main->versionfile == (ver) && (main)->subversionfile < (subver))) #define BLEN_THUMB_SIZE 128 #define BLEN_THUMB_MEMSIZE(_x, _y) \ - (sizeof(BlendThumbnail) + ((size_t)(_x) * (size_t)(_y)) * sizeof(int)) + (sizeof(BlendThumbnail) + ((size_t)(_x) * (size_t)(_y)) * sizeof(int)) /** Protect against buffer overflow vulnerability & negative sizes. */ #define BLEN_THUMB_MEMSIZE_IS_VALID(_x, _y) \ - (((_x) > 0 && (_y) > 0) && \ - ((uint64_t)(_x) * (uint64_t)(_y) < (SIZE_MAX / (sizeof(int) * 4)))) + (((_x) > 0 && (_y) > 0) && ((uint64_t)(_x) * (uint64_t)(_y) < (SIZE_MAX / (sizeof(int) * 4)))) #ifdef __cplusplus } #endif -#endif /* __BKE_MAIN_H__ */ +#endif /* __BKE_MAIN_H__ */ |