[Bf-blender-cvs] [31f47f44dee] blender2.8: Cleanup: avoid shadowing w/ name 'base'

Campbell Barton noreply at git.blender.org
Fri Feb 16 14:07:07 CET 2018


Commit: 31f47f44dee2f1625c584e73e3e7f35e0157dd2a
Author: Campbell Barton
Date:   Fri Feb 16 20:55:24 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB31f47f44dee2f1625c584e73e3e7f35e0157dd2a

Cleanup: avoid shadowing w/ name 'base'

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

M	source/blender/blenkernel/BKE_layer.h

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

diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h
index 633cb2c6044..17b854e5bf7 100644
--- a/source/blender/blenkernel/BKE_layer.h
+++ b/source/blender/blenkernel/BKE_layer.h
@@ -239,9 +239,9 @@ void BKE_visible_bases_iterator_end(BLI_Iterator *iter);
 #define FOREACH_OBJECT(view_layer, _instance)                                 \
 {                                                                             \
 	Object *_instance;                                                        \
-	Base *base;                                                               \
-	for (base = (view_layer)->object_bases.first; base; base = base->next) {  \
-		_instance = base->object;
+	Base *_base;                                                              \
+	for (_base = (view_layer)->object_bases.first; _base; _base = _base->next) { \
+		_instance = _base->object;
 
 #define FOREACH_OBJECT_END                                                    \
     }                                                                         \



More information about the Bf-blender-cvs mailing list