diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2019-03-13 01:55:33 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2019-03-15 22:09:32 +0300 |
commit | 713010bd7795c539c1c18afc3df9f25ab8ba6c12 (patch) | |
tree | 00a02d1383b0e01fb6f81e7242ed3285dfe215f4 /source/blender/blenkernel/BKE_object.h | |
parent | fcffbe1d1b31ed518b7a710c09d5fda389d8182e (diff) |
Fix T62313 - No way to remove object from master collection in 3d view
This introduces a new iterator, FOREACH_COLLECTION, that unlike the
FOREACH_SCENE_COLLECTION it iterates over all the Blender file
collections, including the scene master collection, as well the database
ones (bmain).
Reviewers: brecht
Diffstat (limited to 'source/blender/blenkernel/BKE_object.h')
-rw-r--r-- | source/blender/blenkernel/BKE_object.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h index 9cd98232375..9e6366f9992 100644 --- a/source/blender/blenkernel/BKE_object.h +++ b/source/blender/blenkernel/BKE_object.h @@ -336,8 +336,8 @@ typedef enum eObjectSet { struct LinkNode *BKE_object_relational_superset( struct ViewLayer *view_layer, eObjectSet objectSet, eObRelationTypes includeFilter); -struct LinkNode *BKE_object_groups(struct Main *bmain, struct Object *ob); -void BKE_object_groups_clear(struct Main *bmain, struct Object *object); +struct LinkNode *BKE_object_groups(struct Main *bmain, struct Scene *scene, struct Object *ob); +void BKE_object_groups_clear(struct Main *bmain, struct Scene *scene, struct Object *object); struct KDTree *BKE_object_as_kdtree(struct Object *ob, int *r_tot); |