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

[Campbell Barton]

Commit: afa27f13e351e457a5ec988184a3bed49da54263
Author: Campbell Barton
Date:   Sat Jun 3 00:00:17 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rBafa27f13e351e457a5ec988184a3bed49da54263

Merge branch 'blender2.8' into custom-manipulators

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



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

diff --cc source/blender/editors/interface/resources.c
index f21c6a05bd5,09ec08fe265..8506faa6be0
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@@ -2892,22 -2899,7 +2892,17 @@@ void init_userdef_do_versions(void
  			btheme->ttime.time_keyframe[3] = btheme->ttime.time_gp_keyframe[3] = 255;
  		}
  	}
 +
 +	if (!USER_VERSION_ATLEAST(278, 3)) {
 +		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.
- 	 *
- 	 * (keep this block even if it becomes empty).
- 	 */
- 	{
+ 	if (!USER_VERSION_ATLEAST(280, 1)) {
  		/* interface_widgets.c */
  		struct uiWidgetColors wcol_tab = {
  			{255, 255, 255, 255},
diff --cc source/blender/makesrna/RNA_access.h
index 104c030f464,2982c459169..a91cc019803
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@@ -706,8 -706,8 +706,9 @@@ extern StructRNA RNA_Window
  extern StructRNA RNA_WindowManager;
  extern StructRNA RNA_WipeSequence;
  extern StructRNA RNA_WireframeModifier;
 +extern StructRNA RNA_Widget;
  extern StructRNA RNA_WoodTexture;
+ extern StructRNA RNA_WorkSpace;
  extern StructRNA RNA_World;
  extern StructRNA RNA_WorldAmbientOcclusion;
  extern StructRNA RNA_WorldLighting;