[Bf-blender-cvs] [2580c3cb82b] master: Fix T50112: Sequencer crash w/ missing proxy data

[Campbell Barton]

Commit: 2580c3cb82bd968e84b9e756f9df529bbe161d68
Author: Campbell Barton
Date:   Thu May 25 20:23:31 2017 +1000
Branches: master
https://developer.blender.org/rB2580c3cb82bd968e84b9e756f9df529bbe161d68

Fix T50112: Sequencer crash w/ missing proxy data

===================================================================

M	source/blender/blenloader/intern/readfile.c

===================================================================

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;