Merge remote-tracking branch 'origin/master' into blender2.8

2016-10-13 16:42:54 +00:00
parent ecbedce81e 625b504b23
commit dfa5b32c8c
31 changed files with 528 additions and 153 deletions
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -2767,6 +2767,10 @@ void init_userdef_do_versions(void)
 		for (btheme = U.themes.first; btheme; btheme = btheme->next) {
 			rgba_char_args_set(btheme->tv3d.vertex_bevel, 0, 165, 255, 255);
 			rgba_char_args_set(btheme->tv3d.edge_bevel, 0, 165, 255, 255);
+
+			/* 3dView Keyframe Indicators */
+			btheme->tv3d.time_keyframe[3] = 0xFF;
+			btheme->tv3d.time_gp_keyframe[3] = 0xFF;
 		}
 	}