[Bf-blender-cvs] [f9500de] soc-2016-multiview: fix color scheme version

Tianwei Shen noreply at git.blender.org
Wed Jul 13 09:55:19 CEST 2016


Commit: f9500de41c975deccf836b659edf9b75cbf54745
Author: Tianwei Shen
Date:   Wed Jul 13 15:54:15 2016 +0800
Branches: soc-2016-multiview
https://developer.blender.org/rBf9500de41c975deccf836b659edf9b75cbf54745

fix color scheme version

- move color scheme of linked_marker and sel_linked_marker to 277.2

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

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

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

diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index 5177686..6e516d1 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -2127,8 +2127,6 @@ void init_userdef_do_versions(void)
 				rgba_char_args_set(btheme->tclip.marker, 0x7f, 0x7f, 0x00, 255);
 				rgba_char_args_set(btheme->tclip.act_marker, 0xff, 0xff, 0xff, 255);
 				rgba_char_args_set(btheme->tclip.sel_marker, 0xff, 0xff, 0x00, 255);
-				rgba_char_args_set(btheme->tclip.linked_marker, 0x85, 0xc1, 0xe9, 255);
-				rgba_char_args_set(btheme->tclip.sel_linked_marker, 0xcb, 0x43, 0x35, 255);
 				rgba_char_args_set(btheme->tclip.dis_marker, 0x7f, 0x00, 0x00, 255);
 				rgba_char_args_set(btheme->tclip.lock_marker, 0x7f, 0x7f, 0x7f, 255);
 				rgba_char_args_set(btheme->tclip.path_before, 0xff, 0x00, 0x00, 255);
@@ -2739,6 +2737,9 @@ void init_userdef_do_versions(void)
 		for (btheme = U.themes.first; btheme; btheme = btheme->next) {
 			if (btheme->tact.keyframe_scale_fac < 0.1f)
 				btheme->tact.keyframe_scale_fac = 1.0f;
+
+			rgba_char_args_set(btheme->tclip.linked_marker, 0x85, 0xc1, 0xe9, 255);
+			rgba_char_args_set(btheme->tclip.sel_linked_marker, 0xcb, 0x43, 0x35, 255);
 		}
 	}




More information about the Bf-blender-cvs mailing list