diff options
| author | Julian Eisel <julian@blender.org> | 2021-03-05 19:39:52 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2021-03-05 19:46:49 +0300 |
| commit | ae005393dce4746c0ee97887ea1a81281a1f726f (patch) | |
| tree | e251b50783fd7bfa20137534a276ef62fde99394 /source/blender/editors | |
| parent | b9e54566e3b1a49d9757680da64d8e19c136c706 (diff) | |
Fix incorrect assert in Outliner ID deletion
Mistake in aa3a4973a30f. The expanded `ELEM()` check would include
`0 && te->idcode != 0`, which always evaluates to `false`/`0`. That
wouldn't cause the asset to fail, but the `te->idcode` part would never
be checked.
Fixed the error and cleaned up the check against "0" with a check
against `TSE_SOME_ID`, see b9e54566e3b1a.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_edit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c index c63209b6b60..18abe17d515 100644 --- a/source/blender/editors/space_outliner/outliner_edit.c +++ b/source/blender/editors/space_outliner/outliner_edit.c @@ -464,7 +464,8 @@ static void id_delete(bContext *C, ReportList *reports, TreeElement *te, TreeSto ID *id = tselem->id; BLI_assert(id != NULL); - BLI_assert(ELEM(tselem->type, 0 && te->idcode != 0, TSE_LAYER_COLLECTION)); + BLI_assert(((tselem->type == TSE_SOME_ID) && (te->idcode != 0)) || + (tselem->type == TSE_LAYER_COLLECTION)); UNUSED_VARS_NDEBUG(te); if (te->idcode == ID_LI && ((Library *)id)->parent != NULL) { |