[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50853] trunk/blender/source/blender: Themes fixes:

[Sergey Sharybin]

Revision: 50853
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50853
Author:   nazgul
Date:     2012-09-24 17:57:09 +0000 (Mon, 24 Sep 2012)
Log Message:
-----------
Themes fixes:

- Added initialization of frame node color to default theme loading
  Used default color from 2.63a theme, should be pretty fine as default.

- Added some missing versioning checks which lead to differences between
  startup.blend and default theme restored.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_blender.h
    trunk/blender/source/blender/editors/interface/resources.c

Modified: trunk/blender/source/blender/blenkernel/BKE_blender.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_blender.h	2012-09-24 15:27:04 UTC (rev 50852)
+++ trunk/blender/source/blender/blenkernel/BKE_blender.h	2012-09-24 17:57:09 UTC (rev 50853)
@@ -42,7 +42,7 @@
  * and keep comment above the defines.
  * Use STRINGIFY() rather than defining with quotes */
 #define BLENDER_VERSION         263
-#define BLENDER_SUBVERSION      21
+#define BLENDER_SUBVERSION      22
 
 /* 262 was the last editmesh release but its has compatibility code for bmesh data,
  * so set the minversion to 2.61 */

Modified: trunk/blender/source/blender/editors/interface/resources.c
===================================================================
--- trunk/blender/source/blender/editors/interface/resources.c	2012-09-24 15:27:04 UTC (rev 50852)
+++ trunk/blender/source/blender/editors/interface/resources.c	2012-09-24 17:57:09 UTC (rev 50853)
@@ -901,6 +901,7 @@
 	rgba_char_args_set(btheme->tnode.syntaxb, 108, 105, 111, 255);  /* operator */
 	rgba_char_args_set(btheme->tnode.syntaxv, 104, 106, 117, 255);  /* generator */
 	rgba_char_args_set(btheme->tnode.syntaxc, 105, 117, 110, 255);  /* group */
+	rgba_char_args_set(btheme->tnode.movie, 155, 155, 155, 160);  /* frame */
 	btheme->tnode.noodle_curving = 5;
 
 	/* space logic */
@@ -1934,6 +1935,18 @@
 		}
 	}
 
+	if (bmain->versionfile < 263 || (bmain->versionfile == 263 && bmain->subversionfile < 22)) {
+		bTheme *btheme;
+
+		for (btheme = U.themes.first; btheme; btheme = btheme->next) {
+			if (btheme->tipo.lastsel_point[3] == 0)
+				rgba_char_args_set(btheme->tipo.lastsel_point, 0xff, 0xff, 0xff, 255);
+
+			if (btheme->tv3d.skin_root[3] == 0)
+				rgba_char_args_set(btheme->tv3d.skin_root, 180, 77, 77, 255);
+		}
+	}
+
 	/* GL Texture Garbage Collection (variable abused above!) */
 	if (U.textimeout == 0) {
 		U.texcollectrate = 60;