[Bf-blender-cvs] [fd17d7a864d] custom-manipulators: Merge branch 'blender2.8' into custom-manipulators

[Campbell Barton]

Commit: fd17d7a864d09f134d2c3daaf2f687100e564bf3
Author: Campbell Barton
Date:   Fri Mar 31 16:42:13 2017 +1100
Branches: custom-manipulators
https://developer.blender.org/rBfd17d7a864d09f134d2c3daaf2f687100e564bf3

Merge branch 'blender2.8' into custom-manipulators

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



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

diff --cc source/blender/editors/interface/resources.c
index 3c14c8b97d0,a6235a8d26d..632e74efe9c
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@@ -2881,17 -2871,7 +2873,11 @@@ void init_userdef_do_versions(void
  	 * (keep this block even if it becomes empty).
  	 */
  	{
 -		
 +		for (bTheme *btheme = U.themes.first; btheme; btheme = btheme->next) {
- 			btheme->tcollections = btheme->tv3d;
- 			rgba_char_args_set_fl(btheme->tcollections.back,    0.42, 0.42, 0.42, 1.0);
- 			rgba_char_args_set(btheme->tcollections.hilite, 255, 140, 25, 255);  /* selected files */
- 		}
- 
- 		for (bTheme *btheme = U.themes.first; btheme; btheme = btheme->next) {
 +			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 */
 +		}
  	}
  
  	if (U.pixelsize == 0.0f)