- MovieClip strips now have got valid color for older saved files

- Update Strip Length will now properly update lenght of movie clip
  strips created from movies before lenght was added there.

2 files changed, 11 insertions, 2 deletions

diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c
index 585c1a7dc14..55f257e0feb 100644
--- a/source/blender/blenkernel/intern/movieclip.c
+++ b/source/blender/blenkernel/intern/movieclip.c
@@ -917,8 +917,8 @@ void BKE_movieclip_get_size(MovieClip *clip, MovieClipUser *user, int *width, in
 
 int BKE_movieclip_get_duration(MovieClip *clip)
 {
-	if (!clip->len && clip->anim) {
-		return IMB_anim_get_duration(clip->anim, clip->proxy.tc);
+	if (!clip->len) {
+		movieclip_calc_length(clip);
 	}
 
 	return clip->len;
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index 3cfb429383a..64061a8f76b 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -1767,6 +1767,15 @@ void init_userdef_do_versions(void)
 		}
 	}
 
+	if (bmain->versionfile < 262 || (bmain->versionfile == 262 && bmain->subversionfile < 4)) {
+		bTheme *btheme;
+		for (btheme= U.themes.first; btheme; btheme= btheme->next) {
+			if (btheme->tseq.movieclip[0] == 0) {
+				rgba_char_args_set(btheme->tseq.movieclip,  32, 32, 143, 255);
+			}
+		}
+	}
+
 	/* GL Texture Garbage Collection (variable abused above!) */
 	if (U.textimeout == 0) {
 		U.texcollectrate = 60;