[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35530] trunk/blender/source/blender: patch [#26495] Adjustable outline width for selected objects

[Campbell Barton]

Revision: 35530
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35530
Author:   campbellbarton
Date:     2011-03-14 03:34:57 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
patch [#26495] Adjustable outline width for selected objects

Modified Paths:
--------------
    trunk/blender/source/blender/editors/include/UI_resources.h
    trunk/blender/source/blender/editors/interface/resources.c
    trunk/blender/source/blender/editors/space_view3d/drawobject.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	2011-03-14 03:33:21 UTC (rev 35529)
+++ trunk/blender/source/blender/editors/include/UI_resources.h	2011-03-14 03:34:57 UTC (rev 35530)
@@ -161,6 +161,7 @@
 	TH_VERTEX,
 	TH_VERTEX_SELECT,
 	TH_VERTEX_SIZE,
+	TH_OUTLINE_WIDTH,
 	TH_EDGE,
 	TH_EDGE_SELECT,
 	TH_EDGE_SEAM,

Modified: trunk/blender/source/blender/editors/interface/resources.c
===================================================================
--- trunk/blender/source/blender/editors/interface/resources.c	2011-03-14 03:33:21 UTC (rev 35529)
+++ trunk/blender/source/blender/editors/interface/resources.c	2011-03-14 03:34:57 UTC (rev 35530)
@@ -265,6 +265,8 @@
 				cp= ts->vertex_select; break;
 			case TH_VERTEX_SIZE:
 				cp= &ts->vertex_size; break;
+			case TH_OUTLINE_WIDTH:
+				cp= &ts->outline_width; break;
 			case TH_EDGE:
 				cp= ts->edge; break;
 			case TH_EDGE_SELECT:
@@ -513,6 +515,7 @@
 	SETCOL(btheme->tv3d.vertex, 0, 0, 0, 255);
 	SETCOL(btheme->tv3d.vertex_select, 255, 133, 0, 255);
 	btheme->tv3d.vertex_size= 3;
+	btheme->tv3d.outline_width= 1;
 	SETCOL(btheme->tv3d.edge,       0x0, 0x0, 0x0, 255);
 	SETCOL(btheme->tv3d.edge_select, 255, 160, 0, 255);
 	SETCOL(btheme->tv3d.edge_seam, 219, 37, 18, 255);
@@ -1512,6 +1515,13 @@
 		}
 	}
 	
+	if (bmain->versionfile < 256 || (bmain->versionfile == 256 && bmain->subversionfile < 4)) {
+		bTheme *btheme;
+		for(btheme= U.themes.first; btheme; btheme= btheme->next) {
+			if((btheme->tv3d.outline_width) == 0) btheme->tv3d.outline_width= 1;
+		}
+	}
+
 	if (bmain->versionfile < 257) {
 		/* clear "AUTOKEY_FLAG_ONLYKEYINGSET" flag from userprefs, so that it doesn't linger around from old configs like a ghost */
 		U.autokey_flag &= ~AUTOKEY_FLAG_ONLYKEYINGSET;

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c	2011-03-14 03:33:21 UTC (rev 35529)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2011-03-14 03:34:57 UTC (rev 35530)
@@ -2455,7 +2455,7 @@
 {
 	
 	if(v3d->transp==0) {	// not when we draw the transparent pass
-		glLineWidth(2.0);
+		glLineWidth(UI_GetThemeValuef(TH_OUTLINE_WIDTH) * 2.0);
 		glDepthMask(0);
 		
 		/* if transparent, we cannot draw the edges for solid select... edges have no material info.

Modified: trunk/blender/source/blender/makesdna/DNA_userdef_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_userdef_types.h	2011-03-14 03:33:21 UTC (rev 35529)
+++ trunk/blender/source/blender/makesdna/DNA_userdef_types.h	2011-03-14 03:34:57 UTC (rev 35530)
@@ -219,8 +219,8 @@
 	char console_output[4], console_input[4], console_info[4], console_error[4];
 	char console_cursor[4];
 	
-	char vertex_size, facedot_size;
-	char bpad[2];
+	char vertex_size, outline_width, facedot_size;
+	char bpad;
 
 	char syntaxl[4], syntaxn[4], syntaxb[4]; // syntax for textwindow and nodes
 	char syntaxv[4], syntaxc[4];

Modified: trunk/blender/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_userdef.c	2011-03-14 03:33:21 UTC (rev 35529)
+++ trunk/blender/source/blender/makesrna/intern/rna_userdef.c	2011-03-14 03:34:57 UTC (rev 35530)
@@ -971,6 +971,11 @@
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Current Frame", "");
 	RNA_def_property_update(prop, 0, "rna_userdef_update");
+
+	prop= RNA_def_property(srna, "outline_width", PROP_INT, PROP_NONE);
+	RNA_def_property_range(prop, 1, 5);
+	RNA_def_property_ui_text(prop, "Outline Width", "");
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 }
 
 static void rna_def_userdef_theme_space_graph(BlenderRNA *brna)