[Bf-blender-cvs] [9f1ace2] master: Add themable colors for edges in UV editor. Reuse WIRE_EDIT for outlines and EDGE_SELECT theme colors for selected edges.

[Antony Riakiotakis]

Commit: 9f1ace246951e3d54f6e75d9b8d548501bc4ee0b
Author: Antony Riakiotakis
Date:   Sun Dec 8 01:36:31 2013 +0200
http://developer.blender.org/rB9f1ace246951e3d54f6e75d9b8d548501bc4ee0b

Add themable colors for edges in UV editor. Reuse WIRE_EDIT for outlines
and EDGE_SELECT theme colors for selected edges.

===================================================================

M	source/blender/blenkernel/BKE_blender.h
M	source/blender/editors/interface/resources.c
M	source/blender/editors/uvedit/uvedit_draw.c
M	source/blender/makesrna/intern/rna_userdef.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h
index 989a599..aa6932a 100644
--- a/source/blender/blenkernel/BKE_blender.h
+++ b/source/blender/blenkernel/BKE_blender.h
@@ -42,7 +42,7 @@ extern "C" {
  * and keep comment above the defines.
  * Use STRINGIFY() rather than defining with quotes */
 #define BLENDER_VERSION         269
-#define BLENDER_SUBVERSION      4
+#define BLENDER_SUBVERSION      5
 /* 262 was the last editmesh release but it has compatibility code for bmesh data */
 #define BLENDER_MINVERSION      262
 #define BLENDER_MINSUBVERSION   0
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index 750d219..81c40ec 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -913,6 +913,8 @@ void ui_theme_init_default(void)
 	rgba_char_args_set(btheme->tima.back,   53, 53, 53, 255);
 	rgba_char_args_set(btheme->tima.vertex, 0, 0, 0, 255);
 	rgba_char_args_set(btheme->tima.vertex_select, 255, 133, 0, 255);
+	rgba_char_args_set(btheme->tima.wire_edit, 192, 192, 192, 255);
+	rgba_char_args_set(btheme->tima.edge_select, 255, 133, 0, 255);
 	btheme->tima.vertex_size = 3;
 	btheme->tima.facedot_size = 3;
 	rgba_char_args_set(btheme->tima.face,   255, 255, 255, 10);
@@ -2218,14 +2220,22 @@ void init_userdef_do_versions(void)
 
 	/* NOTE!! from now on use U.versionfile and U.subversionfile */
 
-	if (U.versionfile < 269 || (U.versionfile == 268 && U.subversionfile < 3)) {
+	if (U.versionfile < 268 || (U.versionfile == 268 && U.subversionfile < 3)) {
 		bTheme *btheme;
 		for (btheme = U.themes.first; btheme; btheme = btheme->next) {
 			rgba_char_args_test_set(btheme->tima.uv_others, 96, 96, 96, 255);
 			rgba_char_args_test_set(btheme->tima.uv_shadow, 112, 112, 112, 255);
 		}
 	}
-	
+
+	if (U.versionfile < 269 || (U.versionfile == 269 && U.subversionfile < 5)) {
+		bTheme *btheme;
+		for (btheme = U.themes.first; btheme; btheme = btheme->next) {
+			rgba_char_args_set(btheme->tima.wire_edit, 192, 192, 192, 255);
+			rgba_char_args_set(btheme->tima.edge_select, 255, 133, 0, 255);
+		}
+	}
+
 	if (U.versionfile < 270) {
 		/* grease pencil - new layer color */
 		if (U.gpencil_new_layer_col[3] < 0.1f) {
diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c
index d852982..6d76657 100644
--- a/source/blender/editors/uvedit/uvedit_draw.c
+++ b/source/blender/editors/uvedit/uvedit_draw.c
@@ -694,12 +694,12 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
 			}
 			
 			glLineWidth(1);
-			col2[0] = col2[1] = col2[2] = 192; col2[3] = 255;
-			glColor4ubv((unsigned char *)col2); 
-			
+			UI_GetThemeColor4ubv(TH_WIRE_EDIT, col2);
+			glColor4ubv((unsigned char *)col2);
+
 			if (me->drawflag & ME_DRAWEDGES) {
 				int sel, lastsel = -1;
-				UI_GetThemeColor4ubv(TH_VERTEX_SELECT, col1);
+				UI_GetThemeColor4ubv(TH_EDGE_SELECT, col1);
 
 				if (interpedges) {
 					glShadeModel(GL_SMOOTH);
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index b51e9a4..171a48e 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -2099,7 +2099,17 @@ static void rna_def_userdef_theme_space_image(BlenderRNA *brna)
 	RNA_def_property_array(prop, 4);
 	RNA_def_property_ui_text(prop, "Active Vert/Edge/Face", "");
 	RNA_def_property_update(prop, 0, "rna_userdef_update");
-	
+
+	prop = RNA_def_property(srna, "wire_edit", PROP_FLOAT, PROP_COLOR_GAMMA);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Wire Edit", "");
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
+
+	prop = RNA_def_property(srna, "edge_select", PROP_FLOAT, PROP_COLOR_GAMMA);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Edge Select", "");
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
+
 	prop = RNA_def_property(srna, "scope_back", PROP_FLOAT, PROP_COLOR_GAMMA);
 	RNA_def_property_float_sdna(prop, NULL, "preview_back");
 	RNA_def_property_array(prop, 4);