[Bf-blender-cvs] [e7f3424] master: Fix T38723: Crash on loading with NULL sequence stripdata
Campbell Barton
noreply at git.blender.org
Thu Feb 20 02:41:06 CET 2014
Commit: e7f3424dca094f6615fe1eb7d57ce2084762c462
Author: Campbell Barton
Date: Thu Feb 20 12:32:47 2014 +1100
https://developer.blender.org/rBe7f3424dca094f6615fe1eb7d57ce2084762c462
Fix T38723: Crash on loading with NULL sequence stripdata
===================================================================
M source/blender/blenkernel/intern/bpath.c
===================================================================
diff --git a/source/blender/blenkernel/intern/bpath.c b/source/blender/blenkernel/intern/bpath.c
index 00fff61..d088372 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;
More information about the Bf-blender-cvs
mailing list