diff options
author | Nathan Craddock <nzcraddock@gmail.com> | 2020-07-23 21:50:59 +0300 |
---|---|---|
committer | Nathan Craddock <nzcraddock@gmail.com> | 2020-07-23 21:50:59 +0300 |
commit | c049fe7979de5a3a904a6528878df95ade8e358a (patch) | |
tree | 06b9375eff110473d5ecc2785ea6a108bcf5fd9b /source | |
parent | 5ccb0f46ddaa422d2e542689d5921e774bf42acc (diff) | |
parent | 9cbf43801ba21b0b4aad0aaccf681ebc7e29cc04 (diff) |
Merge branch 'blender-v2.90-release'
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/space_outliner/outliner_tools.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index 7515178e1d1..dae2ba32f09 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -867,11 +867,17 @@ static void id_select_linked_cb(bContext *C, static void singleuser_action_cb(bContext *C, ReportList *UNUSED(reports), Scene *UNUSED(scene), - TreeElement *UNUSED(te), + TreeElement *te, TreeStoreElem *tsep, TreeStoreElem *tselem, void *UNUSED(user_data)) { + /* This callback runs for all selected elements, some of which may not be actions which results + * in a crash. */ + if (te->idcode != ID_AC) { + return; + } + ID *id = tselem->id; if (id) { |