Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Leung <aligorith@gmail.com>2018-02-15 05:45:08 +0300
committerJoshua Leung <aligorith@gmail.com>2018-02-21 15:46:05 +0300
commitf7354119cc8089dd7a788bacec0259db14bf07b8 (patch)
tree1305ff4c0c1291a60662cd95c6eff29cefa5c8ed /source/blender/editors/space_nla
parent2945831630160ad72429c86bd2d87861e37ad378 (diff)
Fix more missing ID remapping in animation editor callbacks
Applying the same fixes as introduced in 98d797b67c07e85889768bf8ecde292e9e6f70e9 this time, for the Graph and NLA editors
Diffstat (limited to 'source/blender/editors/space_nla')
-rw-r--r--source/blender/editors/space_nla/space_nla.c7
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 3b5604087b9..020b3a41f4d 100644
--- a/source/blender/editors/space_nla/space_nla.c
+++ b/source/blender/editors/space_nla/space_nla.c
@@ -506,13 +506,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 */