2 files changed, 75 insertions, 4 deletions

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index e7722e07442..eb22b9a2e2e 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4785,6 +4785,16 @@ static void link_paint(FileData *fd, Scene *sce, Paint *p)
 	}
 }
 
+static void lib_link_sequence_modifiers(FileData *fd, Scene *scene, ListBase *lb)
+{
+	SequenceModifierData *smd;
+
+	for (smd = lb->first; smd; smd = smd->next) {
+		if (smd->mask_id)
+			smd->mask_id = newlibadr_us(fd, scene->id.lib, smd->mask_id);
+	}
+}
+
 static void lib_link_scene(FileData *fd, Main *main)
 {
 	Scene *sce;
@@ -4869,6 +4879,8 @@ static void lib_link_scene(FileData *fd, Main *main)
 					}
 				}
 				seq->anim = NULL;
+
+				lib_link_sequence_modifiers(fd, sce, &seq->modifiers);
 			}
 			SEQ_END
 
@@ -4925,6 +4937,29 @@ static void direct_link_paint(FileData *fd, Paint **paint)
 		(*paint)->num_input_samples = 1;
 }
 
+static void direct_link_sequence_modifiers(FileData *fd, ListBase *lb)
+{
+	SequenceModifierData *smd;
+
+	link_list(fd, lb);
+
+	for (smd = lb->first; smd; smd = smd->next) {
+		if (smd->mask_sequence)
+			smd->mask_sequence = newdataadr(fd, smd->mask_sequence);
+
+		if (smd->type == seqModifierType_Curves) {
+			CurvesModifierData *cmd = (CurvesModifierData *) smd;
+
+			direct_link_curvemapping(fd, &cmd->curve_mapping);
+		}
+		else if (smd->type == seqModifierType_HueCorrect) {
+			HueCorrectModifierData *hcmd = (HueCorrectModifierData *) smd;
+
+			direct_link_curvemapping(fd, &hcmd->curve_mapping);
+		}
+	}
+}
+
 static void direct_link_scene(FileData *fd, Scene *sce)
 {
 	Editing *ed;
@@ -5037,6 +5072,8 @@ static void direct_link_scene(FileData *fd, Scene *sce)
 					// seq->strip->color_balance->gui = 0; // XXX - peter, is this relevant in 2.5?
 				}
 			}
+
+			direct_link_sequence_modifiers(fd, &seq->modifiers);
 		}
 		SEQ_END
 		
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 2a68af688ed..4ada0c54a93 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -646,15 +646,21 @@ static void write_animdata(WriteData *wd, AnimData *adt)
 	write_nladata(wd, &adt->nla_tracks);
 }
 
-static void write_curvemapping(WriteData *wd, CurveMapping *cumap)
+static void write_curvemapping_curves(WriteData *wd, CurveMapping *cumap)
 {
 	int a;
-	
-	writestruct(wd, DATA, "CurveMapping", 1, cumap);
-	for (a=0; a<CM_TOT; a++)
+
+	for (a = 0; a < CM_TOT; a++)
 		writestruct(wd, DATA, "CurveMapPoint", cumap->cm[a].totpoint, cumap->cm[a].curve);
 }
 
+static void write_curvemapping(WriteData *wd, CurveMapping *cumap)
+{
+	writestruct(wd, DATA, "CurveMapping", 1, cumap);
+
+	write_curvemapping_curves(wd, cumap);
+}
+
 static void write_node_socket(WriteData *wd, bNodeSocket *sock)
 {
 	bNodeSocketType *stype= ntreeGetSocketType(sock->type);
@@ -2086,6 +2092,32 @@ static void write_lamps(WriteData *wd, ListBase *idbase)
 	}
 }
 
+static void write_sequence_modifiers(WriteData *wd, ListBase *modbase)
+{
+	SequenceModifierData *smd;
+
+	for (smd = modbase->first; smd; smd = smd->next) {
+		SequenceModifierTypeInfo *smti = BKE_sequence_modifier_type_info_get(smd->type);
+
+		if (smti) {
+			writestruct(wd, DATA, smti->struct_name, 1, smd);
+
+			if (smd->type == seqModifierType_Curves) {
+				CurvesModifierData *cmd = (CurvesModifierData *) smd;
+
+				write_curvemapping(wd, &cmd->curve_mapping);
+			}
+			else if (smd->type == seqModifierType_HueCorrect) {
+				HueCorrectModifierData *hcmd = (HueCorrectModifierData *) smd;
+
+				write_curvemapping(wd, &hcmd->curve_mapping);
+			}
+		}
+		else {
+			writestruct(wd, DATA, "SequenceModifierData", 1, smd);
+		}
+	}
+}
 
 static void write_scenes(WriteData *wd, ListBase *scebase)
 {
@@ -2192,6 +2224,8 @@ static void write_scenes(WriteData *wd, ListBase *scebase)
 					
 					strip->done = TRUE;
 				}
+
+				write_sequence_modifiers(wd, &seq->modifiers);
 			}
 			SEQ_END