diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-03-16 19:28:04 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-03-16 19:28:04 +0300 |
| commit | e2df9ab386fbeaf8220a64aca530641187967842 (patch) | |
| tree | f9d032f87eae63fda7717ad7aa2bc13d8c099d52 /source/blender/editors/space_outliner/outliner_edit.c | |
| parent | fc61cdf1428dc74f4ef9b834de9082f910ce08e0 (diff) | |
| parent | 1f65ab606bcaa6ef60a9e7c9b08b134d46c25e42 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_edit.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_edit.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c index d4a8626e1ab..4d50f2f8bf1 100644 --- a/source/blender/editors/space_outliner/outliner_edit.c +++ b/source/blender/editors/space_outliner/outliner_edit.c @@ -368,9 +368,12 @@ static void id_delete(bContext *C, ReportList *reports, TreeElement *te, TreeSto ID *id = tselem->id; BLI_assert(te->idcode != 0 && id != NULL); - BLI_assert(te->idcode != ID_LI || ((Library *)id)->parent == NULL); UNUSED_VARS_NDEBUG(te); + if (te->idcode == ID_LI && ((Library *)id)->parent != NULL) { + BKE_reportf(reports, RPT_WARNING, "Cannot delete indirectly linked library '%s'", id->name); + return; + } if (id->tag & LIB_TAG_INDIRECT) { BKE_reportf(reports, RPT_WARNING, "Cannot delete indirectly linked id '%s'", id->name); return; |