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:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-04-10 12:59:23 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-04-10 13:00:10 +0300
commit6962119e7f9152d99dac60a5bea76d7c6829d6c9 (patch)
treec21fd2fdecac15db849ef24a8baa91dd7c2908ab /source/blender/editors/space_graph/space_graph.c
parenta74e782f5b3e1df763274e3c8f803562dbbd9a89 (diff)
parent5c3857b3051ff9f40e606ae2fc59f68a1747f1d7 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_graph/space_graph.c')
-rw-r--r--source/blender/editors/space_graph/space_graph.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_graph/space_graph.c b/source/blender/editors/space_graph/space_graph.c
index b03c6a2eb0b..104fff986cf 100644
--- a/source/blender/editors/space_graph/space_graph.c
+++ b/source/blender/editors/space_graph/space_graph.c
@@ -703,7 +703,7 @@ static void graph_id_remap(ScrArea *UNUSED(sa), SpaceLink *slink, ID *old_id, ID
if (sgraph->ads && (ID *)sgraph->ads->filter_grp == old_id) {
sgraph->ads->filter_grp = (Group *)new_id;
}
- if ((ID *)sgraph->ads->source == old_id) {
+ if (sgraph->ads && (ID *)sgraph->ads->source == old_id) {
sgraph->ads->source = new_id;
}
}