[Bf-blender-cvs] [52042f8] wiggly-widgets: Merge branch 'master' into wiggly-widgets

[Julian Eisel]

Commit: 52042f8591d4367ce5b8da9bfa988efa166df9bf
Author: Julian Eisel
Date:   Sun Sep 20 22:15:54 2015 +0200
Branches: wiggly-widgets
https://developer.blender.org/rB52042f8591d4367ce5b8da9bfa988efa166df9bf

Merge branch 'master' into wiggly-widgets

Conflicts:
	source/blender/editors/interface/resources.c
	source/blender/editors/transform/transform_manipulator.c

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



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

diff --cc source/blender/editors/interface/resources.c
index dbbbc13,13eafd7..4a7156d
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@@ -2630,12 -2642,10 +2630,19 @@@ void init_userdef_do_versions(void
  	if (!USER_VERSION_ATLEAST(276, 1)) {
  		bTheme *btheme;
  		for (btheme = U.themes.first; btheme; btheme = btheme->next) {
+ 			rgba_char_args_set_fl(btheme->tima.preview_back, 0.0f, 0.0f, 0.0f, 0.3f);
+ 		}
+ 	}
+ 
++	if (!USER_VERSION_ATLEAST(276, 2)) {
++		bTheme *btheme;
++		for (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)
  		U.pixelsize = 1.0f;