diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-02-20 05:32:47 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-02-20 05:40:28 +0400 |
| commit | e7f3424dca094f6615fe1eb7d57ce2084762c462 (patch) | |
| tree | e48777b209625b270a328f57d1fdc16615c357f2 /source/blender/blenkernel/intern/bpath.c | |
| parent | ea58918171e7135e146e6bb90d988908d7c1540f (diff) | |
Fix T38723: Crash on loading with NULL sequence stripdata
Diffstat (limited to 'source/blender/blenkernel/intern/bpath.c')
| -rw-r--r-- | source/blender/blenkernel/intern/bpath.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/bpath.c b/source/blender/blenkernel/intern/bpath.c index 00fff61c6a2..d0883728a71 100644 --- a/source/blender/blenkernel/intern/bpath.c +++ b/source/blender/blenkernel/intern/bpath.c @@ -578,13 +578,14 @@ void BKE_bpath_traverse_id(Main *bmain, ID *id, BPathVisitor visit_cb, const int SEQ_BEGIN(scene->ed, seq) { if (SEQ_HAS_PATH(seq)) { - if (ELEM(seq->type, SEQ_TYPE_MOVIE, SEQ_TYPE_SOUND_RAM)) { - rewrite_path_fixed_dirfile(seq->strip->dir, seq->strip->stripdata->name, + StripElem *se = seq->strip->stripdata; + + if (ELEM(seq->type, SEQ_TYPE_MOVIE, SEQ_TYPE_SOUND_RAM) && se) { + rewrite_path_fixed_dirfile(seq->strip->dir, se->name, visit_cb, absbase, bpath_user_data); } - else if (seq->type == SEQ_TYPE_IMAGE) { + else if ((seq->type == SEQ_TYPE_IMAGE) && se) { /* might want an option not to loop over all strips */ - StripElem *se = seq->strip->stripdata; int len = MEM_allocN_len(se) / sizeof(*se); int i; |