From e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 06:17:24 +0200 Subject: ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat --- source/blender/blenkernel/BKE_collection.h | 237 +++++++++++++++++------------ 1 file changed, 136 insertions(+), 101 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 180823b791a..f06d9d1e64e 100644 --- a/source/blender/blenkernel/BKE_collection.h +++ b/source/blender/blenkernel/BKE_collection.h @@ -43,44 +43,77 @@ struct Scene; struct ViewLayer; typedef struct CollectionParent { - struct CollectionParent *next, *prev; - struct Collection *collection; + struct CollectionParent *next, *prev; + struct Collection *collection; } CollectionParent; /* Collections */ -struct Collection *BKE_collection_add(struct Main *bmain, struct Collection *parent, const char *name); -void BKE_collection_free(struct Collection *collection); -bool BKE_collection_delete(struct Main *bmain, struct Collection *collection, bool hierarchy); - -struct Collection *BKE_collection_copy(struct Main *bmain, struct Collection *parent, struct Collection *collection); -void BKE_collection_copy_data(struct Main *bmain, struct Collection *collection_dst, const struct Collection *collection_src, const int flag); -void BKE_collection_make_local(struct Main *bmain, struct Collection *collection, const bool lib_local); - -struct Collection *BKE_collection_duplicate( - struct Main *bmain, struct Collection *parent, struct Collection *collection, - const bool do_hierarchy, const bool do_objects, const bool do_obdata); -struct Collection *BKE_collection_copy_master(struct Main *bmain, struct Collection *collection, const int flag); +struct Collection *BKE_collection_add(struct Main *bmain, + struct Collection *parent, + const char *name); +void BKE_collection_free(struct Collection *collection); +bool BKE_collection_delete(struct Main *bmain, struct Collection *collection, bool hierarchy); + +struct Collection *BKE_collection_copy(struct Main *bmain, + struct Collection *parent, + struct Collection *collection); +void BKE_collection_copy_data(struct Main *bmain, + struct Collection *collection_dst, + const struct Collection *collection_src, + const int flag); +void BKE_collection_make_local(struct Main *bmain, + struct Collection *collection, + const bool lib_local); + +struct Collection *BKE_collection_duplicate(struct Main *bmain, + struct Collection *parent, + struct Collection *collection, + const bool do_hierarchy, + const bool do_objects, + const bool do_obdata); +struct Collection *BKE_collection_copy_master(struct Main *bmain, + struct Collection *collection, + const int flag); /* Master Collection for Scene */ struct Collection *BKE_collection_master(const struct Scene *scene); struct Collection *BKE_collection_master_add(void); -struct Scene *BKE_collection_master_scene_search(const struct Main *bmain, const struct Collection *master_collection); +struct Scene *BKE_collection_master_scene_search(const struct Main *bmain, + const struct Collection *master_collection); /* Collection Objects */ -bool BKE_collection_has_object(struct Collection *collection, struct Object *ob); -bool BKE_collection_has_object_recursive(struct Collection *collection, struct Object *ob); -struct Collection *BKE_collection_object_find(struct Main *bmain, struct Scene *scene, struct Collection *collection, struct Object *ob); -bool BKE_collection_is_empty(struct Collection *collection); - -bool BKE_collection_object_add(struct Main *bmain, struct Collection *collection, struct Object *ob); -void BKE_collection_object_add_from(struct Main *bmain, struct Scene *scene, struct Object *ob_src, struct Object *ob_dst); -bool BKE_collection_object_remove(struct Main *bmain, struct Collection *collection, struct Object *object, const bool free_us); -void BKE_collection_object_move(struct Main *bmain, struct Scene *scene, struct Collection *collection_dst, struct Collection *collection_src, struct Object *ob); - -bool BKE_scene_collections_object_remove(struct Main *bmain, struct Scene *scene, struct Object *object, const bool free_us); +bool BKE_collection_has_object(struct Collection *collection, struct Object *ob); +bool BKE_collection_has_object_recursive(struct Collection *collection, struct Object *ob); +struct Collection *BKE_collection_object_find(struct Main *bmain, + struct Scene *scene, + struct Collection *collection, + struct Object *ob); +bool BKE_collection_is_empty(struct Collection *collection); + +bool BKE_collection_object_add(struct Main *bmain, + struct Collection *collection, + struct Object *ob); +void BKE_collection_object_add_from(struct Main *bmain, + struct Scene *scene, + struct Object *ob_src, + struct Object *ob_dst); +bool BKE_collection_object_remove(struct Main *bmain, + struct Collection *collection, + struct Object *object, + const bool free_us); +void BKE_collection_object_move(struct Main *bmain, + struct Scene *scene, + struct Collection *collection_dst, + struct Collection *collection_src, + struct Object *ob); + +bool BKE_scene_collections_object_remove(struct Main *bmain, + struct Scene *scene, + struct Object *object, + const bool free_us); void BKE_collections_object_remove_nulls(struct Main *bmain); void BKE_collections_child_remove_nulls(struct Main *bmain, struct Collection *old_collection); @@ -88,21 +121,26 @@ void BKE_collections_child_remove_nulls(struct Main *bmain, struct Collection *o bool BKE_collection_is_in_scene(struct Collection *collection); void BKE_collections_after_lib_link(struct Main *bmain); -bool BKE_collection_object_cyclic_check(struct Main *bmain, struct Object *object, struct Collection *collection); +bool BKE_collection_object_cyclic_check(struct Main *bmain, + struct Object *object, + struct Collection *collection); /* Object list cache. */ struct ListBase BKE_collection_object_cache_get(struct Collection *collection); void BKE_collection_object_cache_free(struct Collection *collection); -struct Base *BKE_collection_or_layer_objects(const struct ViewLayer *view_layer, struct Collection *collection); +struct Base *BKE_collection_or_layer_objects(const struct ViewLayer *view_layer, + struct Collection *collection); /* Editing. */ struct Collection *BKE_collection_from_index(struct Scene *scene, const int index); void BKE_collection_new_name_get(struct Collection *collection_parent, char *rname); const char *BKE_collection_ui_name_get(struct Collection *collection); -bool BKE_collection_objects_select(struct ViewLayer *view_layer, struct Collection *collection, bool deselect); +bool BKE_collection_objects_select(struct ViewLayer *view_layer, + struct Collection *collection, + bool deselect); /* Collection children */ @@ -121,9 +159,7 @@ bool BKE_collection_move(struct Main *bmain, bool relative_after, struct Collection *collection); -bool BKE_collection_find_cycle(struct Collection *new_ancestor, - struct Collection *collection); - +bool BKE_collection_find_cycle(struct Collection *new_ancestor, struct Collection *collection); /* Iteration callbacks. */ @@ -133,32 +169,28 @@ typedef void (*BKE_scene_collections_Cb)(struct Collection *ob, void *data); /* Iteratorion over objects in collection. */ #define FOREACH_COLLECTION_VISIBLE_OBJECT_RECURSIVE_BEGIN(_collection, _object, _mode) \ - { \ - int _base_flag = (_mode == DAG_EVAL_VIEWPORT) ? \ - BASE_ENABLED_VIEWPORT : BASE_ENABLED_RENDER; \ - int _base_id = 0; \ - for (Base *_base = (Base*)BKE_collection_object_cache_get(_collection).first; \ - _base; \ - _base = _base->next, _base_id++) \ - { \ - if (_base->flag & _base_flag) { \ - Object *_object = _base->object; \ - -#define FOREACH_COLLECTION_VISIBLE_OBJECT_RECURSIVE_END \ - } \ - } \ - } - -#define FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN(_collection, _object) \ - for (Base *_base = (Base*)BKE_collection_object_cache_get(_collection).first; \ - _base; \ - _base = _base->next) \ - { \ - Object *_object = _base->object; \ - BLI_assert(_object != NULL); - -#define FOREACH_COLLECTION_OBJECT_RECURSIVE_END \ - } ((void)0) + { \ + int _base_flag = (_mode == DAG_EVAL_VIEWPORT) ? BASE_ENABLED_VIEWPORT : BASE_ENABLED_RENDER; \ + int _base_id = 0; \ + for (Base *_base = (Base *)BKE_collection_object_cache_get(_collection).first; _base; \ + _base = _base->next, _base_id++) { \ + if (_base->flag & _base_flag) { \ + Object *_object = _base->object; + +#define FOREACH_COLLECTION_VISIBLE_OBJECT_RECURSIVE_END \ + } \ + } \ + } + +#define FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN(_collection, _object) \ + for (Base *_base = (Base *)BKE_collection_object_cache_get(_collection).first; _base; \ + _base = _base->next) { \ + Object *_object = _base->object; \ + BLI_assert(_object != NULL); + +#define FOREACH_COLLECTION_OBJECT_RECURSIVE_END \ + } \ + ((void)0) /* Iteration over collections in scene. */ @@ -170,49 +202,52 @@ void BKE_scene_objects_iterator_begin(struct BLI_Iterator *iter, void *data_in); void BKE_scene_objects_iterator_next(struct BLI_Iterator *iter); void BKE_scene_objects_iterator_end(struct BLI_Iterator *iter); -#define FOREACH_SCENE_COLLECTION_BEGIN(scene, _instance) \ - ITER_BEGIN(BKE_scene_collections_iterator_begin, \ - BKE_scene_collections_iterator_next, \ - BKE_scene_collections_iterator_end, \ - scene, Collection *, _instance) - -#define FOREACH_SCENE_COLLECTION_END \ - ITER_END - -#define FOREACH_COLLECTION_BEGIN(_bmain, _scene, Type, _instance) \ -{ \ - Type _instance; \ - Collection *_instance_next; \ - bool is_scene_collection = (_scene) != NULL; \ - \ - if (_scene) { \ - _instance_next = BKE_collection_master(_scene); \ - } \ - else { \ - _instance_next = (_bmain)->collections.first; \ - } \ - \ - while ((_instance = _instance_next)) { \ - if (is_scene_collection) { \ - _instance_next = (_bmain)->collections.first; \ - is_scene_collection = false; \ - } \ - else { \ - _instance_next = _instance->id.next; \ - } - -#define FOREACH_COLLECTION_END \ - } \ -} ((void)0) - -#define FOREACH_SCENE_OBJECT_BEGIN(scene, _instance) \ - ITER_BEGIN(BKE_scene_objects_iterator_begin, \ - BKE_scene_objects_iterator_next, \ - BKE_scene_objects_iterator_end, \ - scene, Object *, _instance) - -#define FOREACH_SCENE_OBJECT_END \ - ITER_END +#define FOREACH_SCENE_COLLECTION_BEGIN(scene, _instance) \ + ITER_BEGIN (BKE_scene_collections_iterator_begin, \ + BKE_scene_collections_iterator_next, \ + BKE_scene_collections_iterator_end, \ + scene, \ + Collection *, \ + _instance) + +#define FOREACH_SCENE_COLLECTION_END ITER_END + +#define FOREACH_COLLECTION_BEGIN(_bmain, _scene, Type, _instance) \ + { \ + Type _instance; \ + Collection *_instance_next; \ + bool is_scene_collection = (_scene) != NULL; \ +\ + if (_scene) { \ + _instance_next = BKE_collection_master(_scene); \ + } \ + else { \ + _instance_next = (_bmain)->collections.first; \ + } \ +\ + while ((_instance = _instance_next)) { \ + if (is_scene_collection) { \ + _instance_next = (_bmain)->collections.first; \ + is_scene_collection = false; \ + } \ + else { \ + _instance_next = _instance->id.next; \ + } + +#define FOREACH_COLLECTION_END \ + } \ + } \ + ((void)0) + +#define FOREACH_SCENE_OBJECT_BEGIN(scene, _instance) \ + ITER_BEGIN (BKE_scene_objects_iterator_begin, \ + BKE_scene_objects_iterator_next, \ + BKE_scene_objects_iterator_end, \ + scene, \ + Object *, \ + _instance) + +#define FOREACH_SCENE_OBJECT_END ITER_END #ifdef __cplusplus } -- cgit v1.2.3