Commit: 60a17cca279f69f2acc243a19c7a8db6b9abda35
Author: Antony Riakiotakis
Date: Tue Sep 2 18:20:10 2014 +0200
Branches: terrible_consequencer
https://developer.blender.org/rB60a17cca279f69f2acc243a19c7a8db6b9abda35
Fix crash when setting parent.
===================================================================
M source/blender/blenloader/intern/readfile.c
===================================================================
diff --git a/source/blender/blenloader/intern/readfile.c
b/source/blender/blenloader/intern/readfile.c
index b2e49be..2f718d3 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5388,9 +5388,11 @@ static void direct_link_scene(FileData *fd, Scene *sce)
SEQ_BEGIN (ed, seq)
{
- seq->seq1= newdataadr(fd, seq->seq1);
- seq->seq2= newdataadr(fd, seq->seq2);
- seq->seq3= newdataadr(fd, seq->seq3);
+ seq->seq1 = newdataadr(fd, seq->seq1);
+ seq->seq2 = newdataadr(fd, seq->seq2);
+ seq->seq3 = newdataadr(fd, seq->seq3);
+ if (seq->parent)
+ seq->parent = newdataadr(fd, seq->parent);
/* a patch: after introduction of effects with 3 input
strips */
if (seq->seq3 == NULL) seq->seq3 = seq->seq2;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
