From 1ff3d5bc9ab7b296b1c60038d45ef4c030403162 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Tue, 14 Feb 2017 15:46:01 +0100 Subject: 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. --- source/blender/blenkernel/BKE_collection.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/blender/blenkernel/BKE_collection.h') 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 -- cgit v1.2.3