[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46891] trunk/blender/source/blender: Add new theme-able color, TH_SKIN_ROOT.

[Nicholas Bishop]

Revision: 46891
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46891
Author:   nicholasbishop
Date:     2012-05-22 15:29:15 +0000 (Tue, 22 May 2012)
Log Message:
-----------
Add new theme-able color, TH_SKIN_ROOT.

Bumped file version from 263.5 to 263.6 to ensure the default
TH_SKIN_ROOT color gets set.

Skin modifier documentation:
http://wiki.blender.org/index.php/User:Nicholasbishop/SkinModifier

Modified Paths:
--------------
    trunk/blender/source/blender/editors/include/UI_resources.h
    trunk/blender/source/blender/editors/interface/resources.c
    trunk/blender/source/blender/makesdna/DNA_userdef_types.h
    trunk/blender/source/blender/makesrna/intern/rna_userdef.c

Modified: trunk/blender/source/blender/editors/include/UI_resources.h
===================================================================
--- trunk/blender/source/blender/editors/include/UI_resources.h	2012-05-22 15:29:01 UTC (rev 46890)
+++ trunk/blender/source/blender/editors/include/UI_resources.h	2012-05-22 15:29:15 UTC (rev 46891)
@@ -198,7 +198,9 @@
 	TH_STITCH_PREVIEW_ACTIVE,
 
 	TH_MATCH,           /* highlight color for search matches */
-	TH_SELECT_HIGHLIGHT /* highlight color for selected outliner item */
+	TH_SELECT_HIGHLIGHT, /* highlight color for selected outliner item */
+
+	TH_SKIN_ROOT
 };
 /* XXX WARNING: previous is saved in file, so do not change order! */
 

Modified: trunk/blender/source/blender/editors/interface/resources.c
===================================================================
--- trunk/blender/source/blender/editors/interface/resources.c	2012-05-22 15:29:01 UTC (rev 46890)
+++ trunk/blender/source/blender/editors/interface/resources.c	2012-05-22 15:29:15 UTC (rev 46891)
@@ -469,6 +469,10 @@
 				case TH_SELECT_HIGHLIGHT:
 					cp = ts->selected_highlight;
 					break;
+
+				case TH_SKIN_ROOT:
+					cp = ts->skin_root;
+					break;
 			}
 		}
 	}
@@ -702,6 +706,8 @@
 
 	rgba_char_args_set(btheme->tv3d.bundle_solid, 200, 200, 200, 255);
 	rgba_char_args_set(btheme->tv3d.camera_path, 0x00, 0x00, 0x00, 255);
+
+	rgba_char_args_set(btheme->tv3d.skin_root, 180, 77, 77, 255);
 	
 	/* space buttons */
 	/* to have something initialized */
@@ -1808,6 +1814,12 @@
 		}
 	}
 
+	if (bmain->versionfile < 263 || (bmain->versionfile == 263 && bmain->subversionfile < 6)) {
+		bTheme *btheme;
+		for (btheme = U.themes.first; btheme; btheme = btheme->next)
+			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;

Modified: trunk/blender/source/blender/makesdna/DNA_userdef_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_userdef_types.h	2012-05-22 15:29:01 UTC (rev 46890)
+++ trunk/blender/source/blender/makesdna/DNA_userdef_types.h	2012-05-22 15:29:15 UTC (rev 46891)
@@ -261,6 +261,10 @@
 	
 	char match[4];				/* outliner - filter match */
 	char selected_highlight[4];	/* outliner - selected item */
+
+	char skin_root[4]; /* Skin modifier root color */
+
+	int pad4;
 } ThemeSpace;
 
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_userdef.c	2012-05-22 15:29:01 UTC (rev 46890)
+++ trunk/blender/source/blender/makesrna/intern/rna_userdef.c	2012-05-22 15:29:15 UTC (rev 46891)
@@ -1199,6 +1199,11 @@
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Camera Path", "");
 	RNA_def_property_update(prop, 0, "rna_userdef_update");
+
+	prop = RNA_def_property(srna, "skin_root", PROP_FLOAT, PROP_COLOR_GAMMA);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Skin Root", "");
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 }