Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: protect parameters of FOREACH_MAIN_ID & co macros.

Browse Source
This commit is contained in:
Bastien Montagne
2020-02-18 14:37:42 +01:00
parent ce33388413
commit ad9b919962
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/blenkernel/BKE_main.h
View File

@@ -165,9 +165,9 @@ struct GSet *BKE_main_gset_create(struct Main *bmain, struct GSet *gset);
#define FOREACH_MAIN_LISTBASE_ID_BEGIN(_lb, _id) \ #define FOREACH_MAIN_LISTBASE_ID_BEGIN(_lb, _id) \
{ \ { \
ID *_id_next = _lb->first; \ ID *_id_next = (_lb)->first; \
for (_id = _id_next; _id != NULL; _id = _id_next) { \ for ((_id) = _id_next; (_id) != NULL; (_id) = _id_next) { \
_id_next = _id->next; _id_next = (_id)->next;
#define FOREACH_MAIN_LISTBASE_ID_END \ #define FOREACH_MAIN_LISTBASE_ID_END \
} \ } \
@@ -177,9 +177,9 @@ struct GSet *BKE_main_gset_create(struct Main *bmain, struct GSet *gset);
#define FOREACH_MAIN_LISTBASE_BEGIN(_bmain, _lb) \ #define FOREACH_MAIN_LISTBASE_BEGIN(_bmain, _lb) \
{ \ { \
ListBase *_lbarray[MAX_LIBARRAY]; \ ListBase *_lbarray[MAX_LIBARRAY]; \
int _i = set_listbasepointers(_bmain, _lbarray); \ int _i = set_listbasepointers((_bmain), _lbarray); \
while (_i--) { \ while (_i--) { \
_lb = _lbarray[_i]; (_lb) = _lbarray[_i];
#define FOREACH_MAIN_LISTBASE_END \ #define FOREACH_MAIN_LISTBASE_END \
} \ } \
@@ -193,8 +193,8 @@ struct GSet *BKE_main_gset_create(struct Main *bmain, struct GSet *gset);
#define FOREACH_MAIN_ID_BEGIN(_bmain, _id) \ #define FOREACH_MAIN_ID_BEGIN(_bmain, _id) \
{ \ { \
ListBase *_lb; \ ListBase *_lb; \
FOREACH_MAIN_LISTBASE_BEGIN (_bmain, _lb) { \ FOREACH_MAIN_LISTBASE_BEGIN ((_bmain), _lb) { \
FOREACH_MAIN_LISTBASE_ID_BEGIN (_lb, _id) FOREACH_MAIN_LISTBASE_ID_BEGIN (_lb, (_id))
#define FOREACH_MAIN_ID_END \ #define FOREACH_MAIN_ID_END \
FOREACH_MAIN_LISTBASE_ID_END; \ FOREACH_MAIN_LISTBASE_ID_END; \