diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-05-26 12:57:28 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-05-26 12:57:28 +0300 |
| commit | f2a8b74c2572258391c5847c177e59266aee3dab (patch) | |
| tree | 0b3d7d1822beb32d335b0689bb04bb0a3a36f98c /source/blender/blenloader | |
| parent | 3b24ece297afc8ee648f91dbbe890d8aaee7e3bc (diff) | |
| parent | f78ba0df02a9734740d7ccddbe315020f56852f6 (diff) | |
Merge branch 'master' into blender2.8
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 2e3dd972c5e..cd8cbabc2d7 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -6115,9 +6115,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; |