Merge branch 'master' into blender2.8

2017-11-29 18:13:06 +01:00
parent baaf81e13e e4b54f44c1
commit 84d39ab97b
12 changed files with 449 additions and 36 deletions
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -2708,6 +2708,9 @@ static void write_scene(WriteData *wd, Scene *sce)
 						case SEQ_TYPE_TEXT:
 							writestruct(wd, DATA, TextVars, 1, seq->effectdata);
 							break;
+						case SEQ_TYPE_COLORMIX:
+							writestruct(wd, DATA, ColorMixVars, 1, seq->effectdata);
+							break;
 					}
 				}