diff options
author | Julian Eisel <julian@blender.org> | 2022-06-14 16:51:03 +0300 |
---|---|---|
committer | Philipp Oeser <info@graphics-engineer.com> | 2022-06-22 12:28:37 +0300 |
commit | ff1f5236ac7218c9f8cbebf8492885a0544d9b6a (patch) | |
tree | 21b51ab7769a451877b1e0ae604d147b70fb813e /source/blender/editors | |
parent | a8c92331cb0b0eb99ecc2d502996be5e2dbc0adb (diff) |
Fix T98753: Outliner Unlink material in Blender File mode crashes
This issue was only exposed by ba49345705a3. The ID pointer of the
material's parent tree-element wasn't actually pointing to an ID, but to
the list-base containing the IDs. It was just unlikely to cause issues
in practice, although an assert was thrown.
Just don't do anything if the object or object-data to unlink the
material from could not be found. The following commit will introduce a
error message about this.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/space_outliner/outliner_tools.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/editors/space_outliner/outliner_tools.cc b/source/blender/editors/space_outliner/outliner_tools.cc index 5da64177e51..3fc6e6969c5 100644 --- a/source/blender/editors/space_outliner/outliner_tools.cc +++ b/source/blender/editors/space_outliner/outliner_tools.cc @@ -228,6 +228,12 @@ static void unlink_material_fn(bContext *UNUSED(C), TreeStoreElem *UNUSED(tselem), void *UNUSED(user_data)) { + if (!tsep || !TSE_IS_REAL_ID(tsep)) { + /* Valid case, no parent element of the material or it is not an ID (could be a #TSE_ID_BASE + * for example) so there's no data to unlink from. */ + return; + } + Material **matar = nullptr; int a, totcol = 0; |