Layer Macros: create the instance as part of the macro

Instead of pre-initializing an instance prior to the macro, we do it as part of the macro itself now.

5 files changed, 23 insertions, 25 deletions

diff --git a/source/blender/blenkernel/BKE_collection.h b/source/blender/blenkernel/BKE_collection.h
index 90904cdfddd..4d5de723dce 100644
--- a/source/blender/blenkernel/BKE_collection.h
+++ b/source/blender/blenkernel/BKE_collection.h
@@ -66,20 +66,20 @@ void BKE_scene_objects_Iterator_begin(struct Iterator *iter, void *data_in);
 void BKE_scene_objects_Iterator_next(struct Iterator *iter);
 void BKE_scene_objects_Iterator_end(struct Iterator *iter);
 
-#define FOREACH_SCENE_COLLECTION(scene, _sc)                                  \
+#define FOREACH_SCENE_COLLECTION(scene, _instance)                            \
 	ITER_BEGIN(BKE_scene_collections_Iterator_begin,                          \
 	           BKE_scene_collections_Iterator_next,                           \
 	           BKE_scene_collections_Iterator_end,                            \
-	           scene, SceneCollection, _sc)
+	           scene, SceneCollection *, _instance)
 
 #define FOREACH_SCENE_COLLECTION_END                                          \
 	ITER_END
 
-#define FOREACH_SCENE_OBJECT(scene, _ob)                                      \
+#define FOREACH_SCENE_OBJECT(scene, _instance)                                \
 	ITER_BEGIN(BKE_scene_objects_Iterator_begin,                              \
 	           BKE_scene_objects_Iterator_next,                               \
 	           BKE_scene_objects_Iterator_end,                                \
-	           scene, Object, _ob)
+	           scene, Object *, _instance)
 
 #define FOREACH_SCENE_OBJECT_END                                              \
 	ITER_END
diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h
index 248ceea9b95..db817bb3329 100644
--- a/source/blender/blenkernel/BKE_layer.h
+++ b/source/blender/blenkernel/BKE_layer.h
@@ -136,46 +136,47 @@ void BKE_visible_bases_Iterator_begin(Iterator *iter, void *data_in);
 void BKE_visible_bases_Iterator_next(Iterator *iter);
 void BKE_visible_bases_Iterator_end(Iterator *iter);
 
-#define FOREACH_SELECTED_OBJECT(sl, _ob)                                      \
+#define FOREACH_SELECTED_OBJECT(sl, _instance)                                \
 	ITER_BEGIN(BKE_selected_objects_Iterator_begin,                           \
 	           BKE_selected_objects_Iterator_next,                            \
 	           BKE_selected_objects_Iterator_end,                             \
-	           sl, Object, _ob)
+	           sl, Object *, _instance)
 
 #define FOREACH_SELECTED_OBJECT_END                                           \
 	ITER_END
 
-#define FOREACH_VISIBLE_OBJECT(sl, _ob)                                       \
+#define FOREACH_VISIBLE_OBJECT(sl, _instance)                                 \
 	ITER_BEGIN(BKE_visible_objects_Iterator_begin,                            \
 	           BKE_visible_objects_Iterator_next,                             \
 	           BKE_visible_objects_Iterator_end,                              \
-	           sl, Object, _ob)
+	           sl, Object *, _instance)
 
 #define FOREACH_VISIBLE_OBJECT_END                                            \
 	ITER_END
 
 
-#define FOREACH_VISIBLE_BASE(sl, _object_base)                                \
+#define FOREACH_VISIBLE_BASE(sl, _instance)                                   \
 	ITER_BEGIN(BKE_visible_bases_Iterator_begin,                              \
 	           BKE_visible_bases_Iterator_next,                               \
 	           BKE_visible_bases_Iterator_end,                                \
-	           sl, Base, _object_base)
+	           sl, Base *, _instance)
 
 #define FOREACH_VISIBLE_BASE_END                                              \
 	ITER_END
 
 
-#define FOREACH_OBJECT(sl, _ob)                                               \
+#define FOREACH_OBJECT(sl, _instance)                                         \
 {                                                                             \
+	Object *_instance;                                                        \
 	Base *base;                                                               \
-	for (base = sl->object_bases.first; base; base = base->next) {            \
-	    _ob = base->object;
+	for (base = (sl)->object_bases.first; base; base = base->next) {          \
+	    _instance = base->object;
 
 #define FOREACH_OBJECT_END                                                    \
     }                                                                         \
 }
 
-#define FOREACH_OBJECT_FLAG(scene, sl, flag, _ob)                             \
+#define FOREACH_OBJECT_FLAG(scene, sl, flag, _instance)                       \
 {                                                                             \
 	IteratorBeginCb func_begin;                                               \
 	IteratorCb func_next, func_end;                                           \
@@ -185,15 +186,15 @@ void BKE_visible_bases_Iterator_end(Iterator *iter);
 	    func_begin = &BKE_selected_objects_Iterator_begin;                    \
 	    func_next = &BKE_selected_objects_Iterator_next;                      \
 	    func_end = &BKE_selected_objects_Iterator_end;                        \
-	    data_in = sl;                                                         \
+	    data_in = (sl);                                                       \
     }                                                                         \
 	else {                                                                    \
 	    func_begin = BKE_scene_objects_Iterator_begin;                        \
 	    func_next = BKE_scene_objects_Iterator_next;                          \
 	    func_end = BKE_scene_objects_Iterator_end;                            \
-	    data_in = scene;                                                      \
+	    data_in = (scene);                                                    \
     }                                                                         \
-	ITER_BEGIN(func_begin, func_next, func_end, data_in, Object, _ob)
+	ITER_BEGIN(func_begin, func_next, func_end, data_in, Object *, _instance)
 
 
 #define FOREACH_OBJECT_FLAG_END                                               \
@@ -201,16 +202,17 @@ void BKE_visible_bases_Iterator_end(Iterator *iter);
 }
 
 /* temporary hacky solution waiting for final depsgraph evaluation */
-#define DEG_OBJECT_ITER(sl_, ob_)                                             \
+#define DEG_OBJECT_ITER(sl_, instance_)                                       \
 {                                                                             \
+	Object *instance_;                                                        \
 	/* temporary solution, waiting for depsgraph update */                    \
 	BKE_scene_layer_engine_settings_update(sl);                               \
 	                                                                          \
 	/* flush all the data to objects*/                                        \
 	Base *base_;                                                              \
-	for (base_ = sl->object_bases.first; base_; base_ = base_->next) {        \
-	    ob_ = base_->object;			                                      \
-	    ob_->base_flag = base_->flag;
+	for (base_ = (sl_)->object_bases.first; base_; base_ = base_->next) {     \
+	    instance_ = base_->object;			                                  \
+	    instance_->base_flag = base_->flag;
 
 #define DEG_OBJECT_ITER_END                                                   \
     }                                                                         \
diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c
index 289586153ea..100cbf2dd45 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -214,7 +214,6 @@ void BKE_collection_object_add(Scene *scene, SceneCollection *sc, Object *ob)
  */
 void BKE_collection_object_add_from(Scene *scene, Object *ob_src, Object *ob_dst)
 {
-	SceneCollection *sc;
 	FOREACH_SCENE_COLLECTION(scene, sc)
 	{
 		if (BLI_findptr(&sc->objects, ob_src, offsetof(LinkData, data))) {
@@ -257,7 +256,6 @@ void BKE_collections_object_remove(Main *bmain, Scene *scene, Object *ob, const
 {
 	BKE_scene_remove_rigidbody_object(scene, ob);
 
-	SceneCollection *sc;
 	FOREACH_SCENE_COLLECTION(scene, sc)
 	{
 		BKE_collection_object_remove(bmain, scene, sc, ob, free_us);
diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c
index a071b3202be..c9853f791ce 100644
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@ -416,7 +416,6 @@ void BKE_library_foreach_ID_link(Main *bmain, ID *id, LibraryIDLinkCallback call
 					CALLBACK_INVOKE(legacy_base->object, IDWALK_CB_USER);
 				}
 
-				SceneCollection *sc;
 				FOREACH_SCENE_COLLECTION(scene, sc)
 				{
 					for (LinkData *link = sc->objects.first; link; link = link->next) {
diff --git a/source/blender/blenkernel/intern/library_remap.c b/source/blender/blenkernel/intern/library_remap.c
index 9946d1cc81f..76af032c37f 100644
--- a/source/blender/blenkernel/intern/library_remap.c
+++ b/source/blender/blenkernel/intern/library_remap.c
@@ -289,7 +289,6 @@ static void libblock_remap_data_preprocess(IDRemap *r_id_remap_data)
 				/* In case we are unlinking... */
 				if (!r_id_remap_data->old_id) {
 					/* ... everything from scene. */
-					Object *ob_iter;
 					FOREACH_SCENE_OBJECT(sce, ob_iter)
 					{
 						libblock_remap_data_preprocess_scene_object_unlink(