diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-04-13 13:19:31 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-04-13 13:19:31 +0300 |
| commit | 07fc6c922493bf0f6252da663e9854b8c9d95b8b (patch) | |
| tree | 9823b72f6933d323028ba8157e90c7b6db009687 /source/blender/editors/space_nla | |
| parent | 199715eabccce8d91cd4f9705762305e8f236b8c (diff) | |
| parent | 332846b188d6c7463758fb8d8659785beccde63a (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_nla')
| -rw-r--r-- | source/blender/editors/space_nla/space_nla.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/editors/space_nla/space_nla.c b/source/blender/editors/space_nla/space_nla.c index 03265c8dcba..08ac7c8973e 100644 --- a/source/blender/editors/space_nla/space_nla.c +++ b/source/blender/editors/space_nla/space_nla.c @@ -517,12 +517,14 @@ static void nla_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn, Scen static void nla_id_remap(ScrArea *UNUSED(sa), SpaceLink *slink, ID *old_id, ID *new_id) { SpaceNla *snla = (SpaceNla *)slink; - - if ((ID *)snla->ads->filter_grp == old_id) { - snla->ads->filter_grp = (Group *)new_id; - } - if ((ID *)snla->ads->source == old_id) { - snla->ads->source = new_id; + + if (snla->ads) { + if ((ID *)snla->ads->filter_grp == old_id) { + snla->ads->filter_grp = (Group *)new_id; + } + if ((ID *)snla->ads->source == old_id) { + snla->ads->source = new_id; + } } } |