diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-06-15 16:54:11 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-06-15 16:54:11 +0300 |
| commit | a35e733ff18fcdf5b57937cd85f9bcd6aec236b0 (patch) | |
| tree | 30a1508ee4a7b6ba4df705721fb2133b70a20798 /source/blender/editors/object/object_group.c | |
| parent | 60a36f202837037b6f6d31d4d067ec783f53d0ba (diff) | |
| parent | 880e96dd667aedea17353803bcc5721f3cc34d50 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/collada/MeshImporter.cpp
source/blender/editors/object/object_add.c
source/blender/editors/screen/screen_edit.c
Diffstat (limited to 'source/blender/editors/object/object_group.c')
| -rw-r--r-- | source/blender/editors/object/object_group.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_group.c b/source/blender/editors/object/object_group.c index 9d06624bd9c..3064bf8af1a 100644 --- a/source/blender/editors/object/object_group.c +++ b/source/blender/editors/object/object_group.c @@ -522,8 +522,7 @@ static int group_unlink_exec(bContext *C, wmOperator *UNUSED(op)) if (!group) return OPERATOR_CANCELLED; - BKE_libblock_unlink(bmain, group, false, false); - BKE_libblock_free(bmain, group); + BKE_libblock_delete(bmain, group); WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, NULL); |