[Bf-blender-cvs] [d5def0b] transform-manipulators: Use axes colors from custom-manipulators branch

[Julian Eisel]

Commit: d5def0bedf5bc722d5e4a972d7ad65c1082afd29
Author: Julian Eisel
Date:   Thu Nov 10 23:24:08 2016 +0100
Branches: transform-manipulators
https://developer.blender.org/rBd5def0bedf5bc722d5e4a972d7ad65c1082afd29

Use axes colors from custom-manipulators branch

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

M	source/blender/editors/interface/resources.c

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

diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index 64bd023..0668bb6 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -863,9 +863,9 @@ void ui_theme_init_default(void)
 	rgba_char_args_set(btheme->tui.wcol_tooltip.text, 255, 255, 255, 255);
 	rgba_char_args_set_fl(btheme->tui.widget_emboss, 1.0f, 1.0f, 1.0f, 0.02f);
 
-	rgba_char_args_set(btheme->tui.xaxis, 220,   0,   0, 255);
-	rgba_char_args_set(btheme->tui.yaxis,   0, 220,   0, 255);
-	rgba_char_args_set(btheme->tui.zaxis,   0,   0, 220, 255);
+	rgba_char_args_set_fl(btheme->tui.xaxis, 1.0f, 0.27f, 0.27f, 1.0f); /* red */
+	rgba_char_args_set_fl(btheme->tui.yaxis, 0.27f, 1.0f, 0.27f, 1.0f); /* green */
+	rgba_char_args_set_fl(btheme->tui.zaxis, 0.27f, 0.27f, 1.0f, 1.0f); /* blue */
 
 	btheme->tui.menu_shadow_fac = 0.5f;
 	btheme->tui.menu_shadow_width = 12;
@@ -2339,16 +2339,6 @@ void init_userdef_do_versions(void)
 				rgba_char_args_set(btheme->tv3d.skin_root, 180, 77, 77, 255);
 		}
 	}
-	
-	if (!USER_VERSION_ATLEAST(264, 9)) {
-		bTheme *btheme;
-		
-		for (btheme = U.themes.first; btheme; btheme = btheme->next) {
-			rgba_char_args_set(btheme->tui.xaxis, 220,   0,   0, 255);
-			rgba_char_args_set(btheme->tui.yaxis,   0, 220,   0, 255);
-			rgba_char_args_set(btheme->tui.zaxis,   0,   0, 220, 255);
-		}
-	}
 
 	if (!USER_VERSION_ATLEAST(267, 0)) {
 		/* Freestyle color settings */
@@ -2810,6 +2800,10 @@ void init_userdef_do_versions(void)
 			/* Keyframe Indicators (were using wrong alpha) */
 			btheme->tv3d.time_keyframe[3] = btheme->tv3d.time_gp_keyframe[3] = 255;
 			btheme->ttime.time_keyframe[3] = btheme->ttime.time_gp_keyframe[3] = 255;
+
+			rgba_char_args_set_fl(btheme->tui.xaxis, 1.0f, 0.27f, 0.27f, 1.0f); /* red */
+			rgba_char_args_set_fl(btheme->tui.yaxis, 0.27f, 1.0f, 0.27f, 1.0f); /* green */
+			rgba_char_args_set_fl(btheme->tui.zaxis, 0.27f, 0.27f, 1.0f, 1.0f); /* blue */
 		}
 		/* Flag value has changed */
 		U.tw_flag = V3D_USE_TRANSFORM_MANIPULATORS;