[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45178] trunk/blender/source/blender: - MovieClip strips now have got valid color for older saved files

[Sergey Sharybin]

Revision: 45178
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45178
Author:   nazgul
Date:     2012-03-26 13:36:22 +0000 (Mon, 26 Mar 2012)
Log Message:
-----------
- 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.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/movieclip.c
    trunk/blender/source/blender/editors/interface/resources.c

Modified: trunk/blender/source/blender/blenkernel/intern/movieclip.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/movieclip.c	2012-03-26 13:30:53 UTC (rev 45177)
+++ trunk/blender/source/blender/blenkernel/intern/movieclip.c	2012-03-26 13:36:22 UTC (rev 45178)
@@ -917,8 +917,8 @@
 
 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;

Modified: trunk/blender/source/blender/editors/interface/resources.c
===================================================================
--- trunk/blender/source/blender/editors/interface/resources.c	2012-03-26 13:30:53 UTC (rev 45177)
+++ trunk/blender/source/blender/editors/interface/resources.c	2012-03-26 13:36:22 UTC (rev 45178)
@@ -1767,6 +1767,15 @@
 		}
 	}
 
+	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;