[Bf-blender-cvs] [c696b70] custom-manipulators: Fix incorrect color of axes on "Reset to Default Theme"

Julian Eisel noreply at git.blender.org
Thu Nov 10 23:22:24 CET 2016


Commit: c696b70daef678f82a0c59c12282cfa2924229b4
Author: Julian Eisel
Date:   Thu Nov 10 23:21:02 2016 +0100
Branches: custom-manipulators
https://developer.blender.org/rBc696b70daef678f82a0c59c12282cfa2924229b4

Fix incorrect color of axes on "Reset to Default Theme"

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

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

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

diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index 8269497..2920e5a 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -862,9 +862,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;
@@ -2333,16 +2333,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 */




More information about the Bf-blender-cvs mailing list