diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-02-22 02:59:32 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-02-22 02:59:32 +0300 |
| commit | 257cf86a05517fd66d65f55c95fc28ec945804a8 (patch) | |
| tree | c5285a39e47d56ef926a91be803685521ef6f2be /source/blender/editors/space_nla | |
| parent | 04964ff1f4ef9ad23fa3e6cb0444bf28dd6813b5 (diff) | |
| parent | 5d5c6bb5efee9bd03004845f9b1eee9d43883525 (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 | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/editors/space_nla/space_nla.c b/source/blender/editors/space_nla/space_nla.c index f6068087f02..03265c8dcba 100644 --- a/source/blender/editors/space_nla/space_nla.c +++ b/source/blender/editors/space_nla/space_nla.c @@ -518,13 +518,12 @@ static void nla_id_remap(ScrArea *UNUSED(sa), SpaceLink *slink, ID *old_id, ID * { SpaceNla *snla = (SpaceNla *)slink; - if (!ELEM(GS(old_id->name), ID_GR)) { - return; - } - 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; + } } /* only called once, from space/spacetypes.c */ |