griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Outliner: Open empty collection when something is dragged into it

Browse Source 
Reviewers: brecht

Differential Revision: https://developer.blender.org/D3814
This commit is contained in:
Jacques Lucke
2018-10-19 14:30:39 +02:00
parent bdd02cc082
commit c17f2c2eb6
3 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/BKE_collection.h
View File

@@ -75,6 +75,7 @@ struct Collection *BKE_collection_master_add(void);
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 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);

5
source/blender/blenkernel/intern/collection.c
View File

@@ -467,6 +467,11 @@ Collection *BKE_collection_object_find(Main *bmain, Collection *collection, Obje
return NULL;
}
bool BKE_collection_is_empty(Collection *collection)
{
return BLI_listbase_is_empty(&collection->gobject) && BLI_listbase_is_empty(&collection->children);
}
/********************** Collection Objects *********************/
static bool collection_object_add(Main *bmain, Collection *collection, Object *ob, int flag, const bool add_us)

4
source/blender/editors/space_outliner/outliner_dragdrop.c
View File

@@ -794,6 +794,10 @@ static int collection_drop_invoke(bContext *C, wmOperator *UNUSED(op), const wmE
return OPERATOR_CANCELLED;
}
if (BKE_collection_is_empty(data.to)) {
TREESTORE(data.te)->flag &= ~TSE_CLOSED;
}
for (wmDragID *drag_id = drag->ids.first; drag_id; drag_id = drag_id->next) {
/* Ctrl enables linking, so we don't need a from collection then. */
Collection *from = (event->ctrl) ? NULL : collection_parent_from_ID(drag_id->from_parent);