Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/blenkernel/BKE_layer.h
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff)
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
Diffstat (limited to 'source/blender/blenkernel/BKE_layer.h')
-rw-r--r--source/blender/blenkernel/BKE_layer.h464
1 files changed, 245 insertions, 219 deletions
diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h
index 8e66aa55b69..98fb59814fa 100644
--- a/source/blender/blenkernel/BKE_layer.h
+++ b/source/blender/blenkernel/BKE_layer.h
@@ -30,9 +30,9 @@
extern "C" {
#endif
-#define TODO_LAYER_OVERRIDE /* CollectionOverride */
+#define TODO_LAYER_OVERRIDE /* CollectionOverride */
#define TODO_LAYER_OPERATORS /* collection mamanger and property panel operators */
-#define TODO_LAYER /* generic todo */
+#define TODO_LAYER /* generic todo */
struct Base;
struct Collection;
@@ -63,27 +63,34 @@ void BKE_view_layer_free_ex(struct ViewLayer *view_layer, const bool do_id_user)
void BKE_view_layer_selected_objects_tag(struct ViewLayer *view_layer, const int tag);
struct Object *BKE_view_layer_camera_find(struct ViewLayer *view_layer);
-struct ViewLayer *BKE_view_layer_find_from_collection(const struct Scene *scene, struct LayerCollection *lc);
+struct ViewLayer *BKE_view_layer_find_from_collection(const struct Scene *scene,
+ struct LayerCollection *lc);
struct Base *BKE_view_layer_base_find(struct ViewLayer *view_layer, struct Object *ob);
void BKE_view_layer_base_deselect_all(struct ViewLayer *view_layer);
void BKE_view_layer_base_select(struct Base *selbase);
void BKE_view_layer_base_select_and_set_active(struct ViewLayer *view_layer, struct Base *selbase);
-void BKE_view_layer_copy_data(
- struct Scene *scene_dst, const struct Scene *scene_src,
- struct ViewLayer *view_layer_dst, const struct ViewLayer *view_layer_src,
- const int flag);
+void BKE_view_layer_copy_data(struct Scene *scene_dst,
+ const struct Scene *scene_src,
+ struct ViewLayer *view_layer_dst,
+ const struct ViewLayer *view_layer_src,
+ const int flag);
-void BKE_view_layer_rename(struct Main *bmain, struct Scene *scene, struct ViewLayer *view_layer, const char *name);
+void BKE_view_layer_rename(struct Main *bmain,
+ struct Scene *scene,
+ struct ViewLayer *view_layer,
+ const char *name);
struct LayerCollection *BKE_layer_collection_get_active(struct ViewLayer *view_layer);
bool BKE_layer_collection_activate(struct ViewLayer *view_layer, struct LayerCollection *lc);
-struct LayerCollection *BKE_layer_collection_activate_parent(struct ViewLayer *view_layer, struct LayerCollection *lc);
+struct LayerCollection *BKE_layer_collection_activate_parent(struct ViewLayer *view_layer,
+ struct LayerCollection *lc);
int BKE_layer_collection_count(struct ViewLayer *view_layer);
-struct LayerCollection *BKE_layer_collection_from_index(struct ViewLayer *view_layer, const int index);
+struct LayerCollection *BKE_layer_collection_from_index(struct ViewLayer *view_layer,
+ const int index);
int BKE_layer_collection_findindex(struct ViewLayer *view_layer, const struct LayerCollection *lc);
void BKE_main_collection_sync(const struct Main *bmain);
@@ -93,39 +100,47 @@ void BKE_layer_collection_sync(const struct Scene *scene, struct ViewLayer *view
void BKE_main_collection_sync_remap(const struct Main *bmain);
struct LayerCollection *BKE_layer_collection_first_from_scene_collection(
- struct ViewLayer *view_layer, const struct Collection *collection);
-bool BKE_view_layer_has_collection(
- struct ViewLayer *view_layer, const struct Collection *collection);
-bool BKE_scene_has_object(
- struct Scene *scene, struct Object *ob);
+ struct ViewLayer *view_layer, const struct Collection *collection);
+bool BKE_view_layer_has_collection(struct ViewLayer *view_layer,
+ const struct Collection *collection);
+bool BKE_scene_has_object(struct Scene *scene, struct Object *ob);
/* selection and hiding */
-bool BKE_layer_collection_objects_select(
- struct ViewLayer *view_layer, struct LayerCollection *lc, bool deselect);
-bool BKE_layer_collection_has_selected_objects(
- struct ViewLayer *view_layer, struct LayerCollection *lc);
-bool BKE_layer_collection_has_layer_collection(
- struct LayerCollection *lc_parent, struct LayerCollection *lc_child);
-
-void BKE_base_set_visible(struct Scene *scene, struct ViewLayer *view_layer, struct Base *base, bool extend);
-bool BKE_layer_collection_isolate(struct Scene *scene, struct ViewLayer *view_layer, struct LayerCollection *lc, bool extend);
-bool BKE_layer_collection_set_visible(struct ViewLayer *view_layer, struct LayerCollection *lc, const bool visible, const bool hierarchy);
+bool BKE_layer_collection_objects_select(struct ViewLayer *view_layer,
+ struct LayerCollection *lc,
+ bool deselect);
+bool BKE_layer_collection_has_selected_objects(struct ViewLayer *view_layer,
+ struct LayerCollection *lc);
+bool BKE_layer_collection_has_layer_collection(struct LayerCollection *lc_parent,
+ struct LayerCollection *lc_child);
+
+void BKE_base_set_visible(struct Scene *scene,
+ struct ViewLayer *view_layer,
+ struct Base *base,
+ bool extend);
+bool BKE_layer_collection_isolate(struct Scene *scene,
+ struct ViewLayer *view_layer,
+ struct LayerCollection *lc,
+ bool extend);
+bool BKE_layer_collection_set_visible(struct ViewLayer *view_layer,
+ struct LayerCollection *lc,
+ const bool visible,
+ const bool hierarchy);
/* evaluation */
void BKE_base_eval_flags(struct Base *base);
-void BKE_layer_eval_view_layer_indexed(
- struct Depsgraph *depsgraph,
- struct Scene *scene,
- int view_layer_index);
+void BKE_layer_eval_view_layer_indexed(struct Depsgraph *depsgraph,
+ struct Scene *scene,
+ int view_layer_index);
/* iterators */
typedef struct ObjectsVisibleIteratorData {
- struct ViewLayer *view_layer;
- struct View3D *v3d;
+ struct ViewLayer *view_layer;
+ struct View3D *v3d;
} ObjectsVisibleIteratorData;
void BKE_view_layer_selected_objects_iterator_begin(BLI_Iterator *iter, void *data_in);
@@ -141,11 +156,11 @@ void BKE_view_layer_selected_editable_objects_iterator_next(BLI_Iterator *iter);
void BKE_view_layer_selected_editable_objects_iterator_end(BLI_Iterator *iter);
struct ObjectsInModeIteratorData {
- int object_mode;
- int object_type;
- struct ViewLayer *view_layer;
- struct View3D *v3d;
- struct Base *base_active;
+ int object_mode;
+ int object_type;
+ struct ViewLayer *view_layer;
+ struct View3D *v3d;
+ struct Base *base_active;
};
void BKE_view_layer_bases_in_mode_iterator_begin(BLI_Iterator *iter, void *data_in);
@@ -160,181 +175,199 @@ void BKE_view_layer_visible_bases_iterator_begin(BLI_Iterator *iter, void *data_
void BKE_view_layer_visible_bases_iterator_next(BLI_Iterator *iter);
void BKE_view_layer_visible_bases_iterator_end(BLI_Iterator *iter);
-#define FOREACH_SELECTED_OBJECT_BEGIN(_view_layer, _v3d, _instance) \
-{ \
- struct ObjectsVisibleIteratorData data_ = { \
- .view_layer = _view_layer, \
- .v3d = _v3d, \
- }; \
- ITER_BEGIN(BKE_view_layer_selected_objects_iterator_begin, \
- BKE_view_layer_selected_objects_iterator_next, \
- BKE_view_layer_selected_objects_iterator_end, \
- &data_, Object *, _instance)
-
-#define FOREACH_SELECTED_OBJECT_END \
- ITER_END; \
-} ((void)0)
-
-#define FOREACH_SELECTED_EDITABLE_OBJECT_BEGIN(_view_layer, _v3d, _instance) \
-{ \
- struct ObjectsVisibleIteratorData data_ = { \
- .view_layer = _view_layer, \
- .v3d = _v3d, \
- }; \
- ITER_BEGIN(BKE_view_layer_selected_editable_objects_iterator_begin, \
- BKE_view_layer_selected_editable_objects_iterator_next, \
- BKE_view_layer_selected_editable_objects_iterator_end, \
- &data_, Object *, _instance)
-
-#define FOREACH_SELECTED_EDITABLE_OBJECT_END \
- ITER_END; \
-} ((void)0)
-
-#define FOREACH_VISIBLE_OBJECT_BEGIN(_view_layer, _v3d, _instance) \
-{ \
- struct ObjectsVisibleIteratorData data_ = { \
- .view_layer = _view_layer, \
- .v3d = _v3d, \
- }; \
- ITER_BEGIN(BKE_view_layer_visible_objects_iterator_begin, \
- BKE_view_layer_visible_objects_iterator_next, \
- BKE_view_layer_visible_objects_iterator_end, \
- &data_, Object *, _instance)
-
-#define FOREACH_VISIBLE_OBJECT_END \
- ITER_END; \
-} ((void)0)
+#define FOREACH_SELECTED_OBJECT_BEGIN(_view_layer, _v3d, _instance) \
+ { \
+ struct ObjectsVisibleIteratorData data_ = { \
+ .view_layer = _view_layer, \
+ .v3d = _v3d, \
+ }; \
+ ITER_BEGIN (BKE_view_layer_selected_objects_iterator_begin, \
+ BKE_view_layer_selected_objects_iterator_next, \
+ BKE_view_layer_selected_objects_iterator_end, \
+ &data_, \
+ Object *, \
+ _instance)
+
+#define FOREACH_SELECTED_OBJECT_END \
+ ITER_END; \
+ } \
+ ((void)0)
+
+#define FOREACH_SELECTED_EDITABLE_OBJECT_BEGIN(_view_layer, _v3d, _instance) \
+ { \
+ struct ObjectsVisibleIteratorData data_ = { \
+ .view_layer = _view_layer, \
+ .v3d = _v3d, \
+ }; \
+ ITER_BEGIN (BKE_view_layer_selected_editable_objects_iterator_begin, \
+ BKE_view_layer_selected_editable_objects_iterator_next, \
+ BKE_view_layer_selected_editable_objects_iterator_end, \
+ &data_, \
+ Object *, \
+ _instance)
+
+#define FOREACH_SELECTED_EDITABLE_OBJECT_END \
+ ITER_END; \
+ } \
+ ((void)0)
+
+#define FOREACH_VISIBLE_OBJECT_BEGIN(_view_layer, _v3d, _instance) \
+ { \
+ struct ObjectsVisibleIteratorData data_ = { \
+ .view_layer = _view_layer, \
+ .v3d = _v3d, \
+ }; \
+ ITER_BEGIN (BKE_view_layer_visible_objects_iterator_begin, \
+ BKE_view_layer_visible_objects_iterator_next, \
+ BKE_view_layer_visible_objects_iterator_end, \
+ &data_, \
+ Object *, \
+ _instance)
+
+#define FOREACH_VISIBLE_OBJECT_END \
+ ITER_END; \
+ } \
+ ((void)0)
#define FOREACH_BASE_IN_MODE_BEGIN(_view_layer, _v3d, _object_type, _object_mode, _instance) \
-{ \
- struct ObjectsInModeIteratorData data_ = { \
- .object_mode = _object_mode, \
- .object_type = _object_type, \
- .view_layer = _view_layer, \
- .v3d = _v3d, \
- .base_active = _view_layer->basact, \
- }; \
- ITER_BEGIN(BKE_view_layer_bases_in_mode_iterator_begin, \
- BKE_view_layer_bases_in_mode_iterator_next, \
- BKE_view_layer_bases_in_mode_iterator_end, \
- &data_, Base *, _instance)
-
-#define FOREACH_BASE_IN_MODE_END \
- ITER_END; \
-} ((void)0)
-
-#define FOREACH_BASE_IN_EDIT_MODE_BEGIN(_view_layer, _v3d, _instance) \
- FOREACH_BASE_IN_MODE_BEGIN(_view_layer, _v3d, -1, OB_MODE_EDIT, _instance)
-
-#define FOREACH_BASE_IN_EDIT_MODE_END \
- FOREACH_BASE_IN_MODE_END
+ { \
+ struct ObjectsInModeIteratorData data_ = { \
+ .object_mode = _object_mode, \
+ .object_type = _object_type, \
+ .view_layer = _view_layer, \
+ .v3d = _v3d, \
+ .base_active = _view_layer->basact, \
+ }; \
+ ITER_BEGIN (BKE_view_layer_bases_in_mode_iterator_begin, \
+ BKE_view_layer_bases_in_mode_iterator_next, \
+ BKE_view_layer_bases_in_mode_iterator_end, \
+ &data_, \
+ Base *, \
+ _instance)
+
+#define FOREACH_BASE_IN_MODE_END \
+ ITER_END; \
+ } \
+ ((void)0)
+
+#define FOREACH_BASE_IN_EDIT_MODE_BEGIN(_view_layer, _v3d, _instance) \
+ FOREACH_BASE_IN_MODE_BEGIN (_view_layer, _v3d, -1, OB_MODE_EDIT, _instance)
+
+#define FOREACH_BASE_IN_EDIT_MODE_END FOREACH_BASE_IN_MODE_END
#define FOREACH_OBJECT_IN_MODE_BEGIN(_view_layer, _v3d, _object_type, _object_mode, _instance) \
- FOREACH_BASE_IN_MODE_BEGIN(_view_layer, _v3d, _object_type, _object_mode, _base) { \
- Object *_instance = _base->object;
-
-#define FOREACH_OBJECT_IN_MODE_END \
- } FOREACH_BASE_IN_MODE_END
-
-#define FOREACH_OBJECT_IN_EDIT_MODE_BEGIN(_view_layer, _v3d, _instance) \
- FOREACH_BASE_IN_EDIT_MODE_BEGIN(_view_layer, _v3d, _base) { \
- Object *_instance = _base->object;
-
-#define FOREACH_OBJECT_IN_EDIT_MODE_END \
- } FOREACH_BASE_IN_EDIT_MODE_END
-
-#define FOREACH_SELECTED_BASE_BEGIN(view_layer, _instance) \
- ITER_BEGIN(BKE_view_layer_selected_bases_iterator_begin, \
- BKE_view_layer_selected_bases_iterator_next, \
- BKE_view_layer_selected_bases_iterator_end, \
- view_layer, Base *, _instance)
-
-#define FOREACH_SELECTED_BASE_END \
- ITER_END
-
-#define FOREACH_VISIBLE_BASE_BEGIN(_view_layer, _v3d, _instance) \
-{ \
- struct ObjectsVisibleIteratorData data_ = { \
- .view_layer = _view_layer, \
- .v3d = _v3d, \
- }; \
- ITER_BEGIN(BKE_view_layer_visible_bases_iterator_begin, \
- BKE_view_layer_visible_bases_iterator_next, \
- BKE_view_layer_visible_bases_iterator_end, \
- &data_, Base *, _instance)
-
-#define FOREACH_VISIBLE_BASE_END \
- ITER_END; \
-} ((void)0)
-
-
-#define FOREACH_OBJECT_BEGIN(view_layer, _instance) \
-{ \
- Object *_instance; \
- Base *_base; \
- for (_base = (view_layer)->object_bases.first; _base; _base = _base->next) { \
- _instance = _base->object;
-
-#define FOREACH_OBJECT_END \
- } \
-} ((void)0)
-
-#define FOREACH_OBJECT_FLAG_BEGIN(scene, _view_layer, _v3d, flag, _instance) \
-{ \
- IteratorBeginCb func_begin; \
- IteratorCb func_next, func_end; \
- void *data_in; \
- struct ObjectsVisibleIteratorData data_ = { \
- .view_layer = _view_layer, \
- .v3d = _v3d, \
- }; \
- \
- if (flag == SELECT) { \
- func_begin = &BKE_view_layer_selected_objects_iterator_begin; \
- func_next = &BKE_view_layer_selected_objects_iterator_next; \
- func_end = &BKE_view_layer_selected_objects_iterator_end; \
- data_in = &data_; \
- } \
- 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); \
- } \
- ITER_BEGIN(func_begin, func_next, func_end, data_in, Object *, _instance)
-
-
-#define FOREACH_OBJECT_FLAG_END \
- ITER_END; \
-} ((void)0)
+ FOREACH_BASE_IN_MODE_BEGIN (_view_layer, _v3d, _object_type, _object_mode, _base) { \
+ Object *_instance = _base->object;
+
+#define FOREACH_OBJECT_IN_MODE_END \
+ } \
+ FOREACH_BASE_IN_MODE_END
+
+#define FOREACH_OBJECT_IN_EDIT_MODE_BEGIN(_view_layer, _v3d, _instance) \
+ FOREACH_BASE_IN_EDIT_MODE_BEGIN (_view_layer, _v3d, _base) { \
+ Object *_instance = _base->object;
+
+#define FOREACH_OBJECT_IN_EDIT_MODE_END \
+ } \
+ FOREACH_BASE_IN_EDIT_MODE_END
+
+#define FOREACH_SELECTED_BASE_BEGIN(view_layer, _instance) \
+ ITER_BEGIN (BKE_view_layer_selected_bases_iterator_begin, \
+ BKE_view_layer_selected_bases_iterator_next, \
+ BKE_view_layer_selected_bases_iterator_end, \
+ view_layer, \
+ Base *, \
+ _instance)
+
+#define FOREACH_SELECTED_BASE_END ITER_END
+
+#define FOREACH_VISIBLE_BASE_BEGIN(_view_layer, _v3d, _instance) \
+ { \
+ struct ObjectsVisibleIteratorData data_ = { \
+ .view_layer = _view_layer, \
+ .v3d = _v3d, \
+ }; \
+ ITER_BEGIN (BKE_view_layer_visible_bases_iterator_begin, \
+ BKE_view_layer_visible_bases_iterator_next, \
+ BKE_view_layer_visible_bases_iterator_end, \
+ &data_, \
+ Base *, \
+ _instance)
+
+#define FOREACH_VISIBLE_BASE_END \
+ ITER_END; \
+ } \
+ ((void)0)
+
+#define FOREACH_OBJECT_BEGIN(view_layer, _instance) \
+ { \
+ Object *_instance; \
+ Base *_base; \
+ for (_base = (view_layer)->object_bases.first; _base; _base = _base->next) { \
+ _instance = _base->object;
+
+#define FOREACH_OBJECT_END \
+ } \
+ } \
+ ((void)0)
+
+#define FOREACH_OBJECT_FLAG_BEGIN(scene, _view_layer, _v3d, flag, _instance) \
+ { \
+ IteratorBeginCb func_begin; \
+ IteratorCb func_next, func_end; \
+ void *data_in; \
+ struct ObjectsVisibleIteratorData data_ = { \
+ .view_layer = _view_layer, \
+ .v3d = _v3d, \
+ }; \
+\
+ if (flag == SELECT) { \
+ func_begin = &BKE_view_layer_selected_objects_iterator_begin; \
+ func_next = &BKE_view_layer_selected_objects_iterator_next; \
+ func_end = &BKE_view_layer_selected_objects_iterator_end; \
+ data_in = &data_; \
+ } \
+ 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); \
+ } \
+ ITER_BEGIN (func_begin, func_next, func_end, data_in, Object *, _instance)
+
+#define FOREACH_OBJECT_FLAG_END \
+ ITER_END; \
+ } \
+ ((void)0)
/* layer_utils.c */
struct ObjectsInModeParams {
- int object_mode;
- uint no_dup_data : 1;
+ int object_mode;
+ uint no_dup_data : 1;
- bool (*filter_fn)(struct Object *ob, void *user_data);
- void *filter_userdata;
+ bool (*filter_fn)(struct Object *ob, void *user_data);
+ void *filter_userdata;
};
-Base **BKE_view_layer_array_from_bases_in_mode_params(
- struct ViewLayer *view_layer, struct View3D *v3d, uint *r_len,
- const struct ObjectsInModeParams *params);
+Base **BKE_view_layer_array_from_bases_in_mode_params(struct ViewLayer *view_layer,
+ struct View3D *v3d,
+ uint *r_len,
+ const struct ObjectsInModeParams *params);
struct Object **BKE_view_layer_array_from_objects_in_mode_params(
- struct ViewLayer *view_layer, struct View3D *v3d, uint *len,
- const struct ObjectsInModeParams *params);
+ struct ViewLayer *view_layer,
+ struct View3D *v3d,
+ uint *len,
+ const struct ObjectsInModeParams *params);
#define BKE_view_layer_array_from_objects_in_mode(view_layer, v3d, r_len, ...) \
- BKE_view_layer_array_from_objects_in_mode_params( \
- view_layer, v3d, r_len, \
- &(const struct ObjectsInModeParams)__VA_ARGS__)
+ BKE_view_layer_array_from_objects_in_mode_params( \
+ view_layer, v3d, r_len, &(const struct ObjectsInModeParams)__VA_ARGS__)
#define BKE_view_layer_array_from_bases_in_mode(view_layer, v3d, r_len, ...) \
- BKE_view_layer_array_from_bases_in_mode_params( \
- view_layer, v3d, r_len, \
- &(const struct ObjectsInModeParams)__VA_ARGS__)
+ BKE_view_layer_array_from_bases_in_mode_params( \
+ view_layer, v3d, r_len, &(const struct ObjectsInModeParams)__VA_ARGS__)
bool BKE_view_layer_filter_edit_mesh_has_uvs(struct Object *ob, void *user_data);
bool BKE_view_layer_filter_edit_mesh_has_edges(struct Object *ob, void *user_data);
@@ -342,39 +375,32 @@ bool BKE_view_layer_filter_edit_mesh_has_edges(struct Object *ob, void *user_dat
/* Utility macros that wrap common args (add more as needed). */
#define BKE_view_layer_array_from_objects_in_edit_mode(view_layer, v3d, r_len) \
- BKE_view_layer_array_from_objects_in_mode( \
- view_layer, v3d, r_len, { \
- .object_mode = OB_MODE_EDIT})
+ BKE_view_layer_array_from_objects_in_mode(view_layer, v3d, r_len, {.object_mode = OB_MODE_EDIT})
#define BKE_view_layer_array_from_bases_in_edit_mode(view_layer, v3d, r_len) \
- BKE_view_layer_array_from_bases_in_mode( \
- view_layer, v3d, r_len, { \
- .object_mode = OB_MODE_EDIT})
+ BKE_view_layer_array_from_bases_in_mode(view_layer, v3d, r_len, {.object_mode = OB_MODE_EDIT})
#define BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, v3d, r_len) \
- BKE_view_layer_array_from_objects_in_mode( \
- view_layer, v3d, r_len, { \
- .object_mode = OB_MODE_EDIT, \
- .no_dup_data = true})
+ BKE_view_layer_array_from_objects_in_mode( \
+ view_layer, v3d, r_len, {.object_mode = OB_MODE_EDIT, .no_dup_data = true})
#define BKE_view_layer_array_from_bases_in_edit_mode_unique_data(view_layer, v3d, r_len) \
- BKE_view_layer_array_from_bases_in_mode( \
- view_layer, v3d, r_len, { \
- .object_mode = OB_MODE_EDIT, \
- .no_dup_data = true})
-
-#define BKE_view_layer_array_from_objects_in_edit_mode_unique_data_with_uvs(view_layer, v3d, r_len) \
- BKE_view_layer_array_from_objects_in_mode( \
- view_layer, v3d, r_len, { \
- .object_mode = OB_MODE_EDIT, \
- .no_dup_data = true, \
- .filter_fn = BKE_view_layer_filter_edit_mesh_has_uvs})
+ BKE_view_layer_array_from_bases_in_mode( \
+ view_layer, v3d, r_len, {.object_mode = OB_MODE_EDIT, .no_dup_data = true})
+
+#define BKE_view_layer_array_from_objects_in_edit_mode_unique_data_with_uvs( \
+ view_layer, v3d, r_len) \
+ BKE_view_layer_array_from_objects_in_mode( \
+ view_layer, \
+ v3d, \
+ r_len, \
+ {.object_mode = OB_MODE_EDIT, \
+ .no_dup_data = true, \
+ .filter_fn = BKE_view_layer_filter_edit_mesh_has_uvs})
#define BKE_view_layer_array_from_objects_in_mode_unique_data(view_layer, v3d, r_len, mode) \
- BKE_view_layer_array_from_objects_in_mode( \
- view_layer, v3d, r_len, { \
- .object_mode = mode, \
- .no_dup_data = true})
+ BKE_view_layer_array_from_objects_in_mode( \
+ view_layer, v3d, r_len, {.object_mode = mode, .no_dup_data = true})
#ifdef __cplusplus
}