diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-05-25 13:23:31 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-05-25 13:23:31 +0300 |
| commit | 2580c3cb82bd968e84b9e756f9df529bbe161d68 (patch) | |
| tree | fff498f7c43bd6221a53d5b046d7d51f4dbbecd2 /source/blender/blenloader | |
| parent | 1ddf67382bec8838de8f569281a68275d05356cf (diff) | |
Fix T50112: Sequencer crash w/ missing proxy data
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index b909205392e..01951b0266f 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -6096,9 +6096,13 @@ static void direct_link_scene(FileData *fd, Scene *sce) seq->strip->transform = NULL; } if (seq->flag & SEQ_USE_PROXY) { - seq->strip->proxy = newdataadr( - fd, seq->strip->proxy); - seq->strip->proxy->anim = NULL; + seq->strip->proxy = newdataadr(fd, seq->strip->proxy); + if (seq->strip->proxy) { + seq->strip->proxy->anim = NULL; + } + else { + BKE_sequencer_proxy_set(seq, true); + } } else { seq->strip->proxy = NULL; |