[Bf-blender-cvs] [4c2330bd537] master: BKE_main: FOREACH macros: fix shadowing 'i' variable.

Bastien Montagne noreply at git.blender.org
Mon Feb 18 17:16:46 CET 2019


Commit: 4c2330bd537a6a6d1fa0030fe0bb14380dc7eeb6
Author: Bastien Montagne
Date:   Mon Feb 18 16:12:36 2019 +0100
Branches: master
https://developer.blender.org/rB4c2330bd537a6a6d1fa0030fe0bb14380dc7eeb6

BKE_main: FOREACH macros: fix shadowing 'i' variable.

===================================================================

M	source/blender/blenkernel/BKE_main.h

===================================================================

diff --git a/source/blender/blenkernel/BKE_main.h b/source/blender/blenkernel/BKE_main.h
index cd17d84651c..c31bc6c7f15 100644
--- a/source/blender/blenkernel/BKE_main.h
+++ b/source/blender/blenkernel/BKE_main.h
@@ -156,9 +156,9 @@ struct GSet *BKE_main_gset_create(struct Main *bmain, struct GSet *gset);
 #define FOREACH_MAIN_ID_BEGIN(_bmain, _id)                                \
 	{                                                                     \
 		ListBase *_lbarray[MAX_LIBARRAY];                                 \
-		int i = set_listbasepointers(_bmain, _lbarray);                   \
-		while (i--) {                                                     \
-			FOREACH_MAIN_LISTBASE_ID_BEGIN(_lbarray[i], _id)
+		int _i = set_listbasepointers(_bmain, _lbarray);                  \
+		while (_i--) {                                                    \
+			FOREACH_MAIN_LISTBASE_ID_BEGIN(_lbarray[_i], _id)
 
 #define FOREACH_MAIN_ID_END                                               \
 			FOREACH_MAIN_LISTBASE_ID_END;                                 \



More information about the Bf-blender-cvs mailing list