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

[Julian Eisel]

Commit: e726a542867b18517bf2356d36673eb9f44bc019
Author: Julian Eisel
Date:   Thu Sep 8 12:35:36 2016 +0200
Branches: wiggly-widgets
https://developer.blender.org/rBe726a542867b18517bf2356d36673eb9f44bc019

Merge branch 'master' into wiggly-widgets

Conflicts:
	source/blender/blenkernel/BKE_blender_version.h

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



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

diff --cc source/blender/blenkernel/BKE_blender_version.h
index 2247d32,3ae01d8..5514251
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@@ -27,8 -27,8 +27,8 @@@
  /* these lines are grep'd, watch out for our not-so-awesome regex
   * and keep comment above the defines.
   * Use STRINGIFY() rather than defining with quotes */
- #define BLENDER_VERSION         277
- #define BLENDER_SUBVERSION      4
+ #define BLENDER_VERSION         278
 -#define BLENDER_SUBVERSION      0
++#define BLENDER_SUBVERSION      1
  /* Several breakages with 270, e.g. constraint deg vs rad */
  #define BLENDER_MINVERSION      270
  #define BLENDER_MINSUBVERSION   6
diff --cc source/blender/editors/interface/resources.c
index 308df8d,c8ff335..43dd2d8
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@@ -2729,15 -2734,6 +2729,15 @@@ void init_userdef_do_versions(void
  		}
  	}
  
- 	if (!USER_VERSION_ATLEAST(277, 4)) {
++	if (!USER_VERSION_ATLEAST(278, 1)) {
 +		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 */
 +		}
 +	}
 +
  	/**
  	 * Include next version bump.
  	 *