[Bf-blender-cvs] [4ade467] UI-graphical-redesign: Merge branch 'master' into UI-graphical-redesign

[Julian Eisel]

Commit: 4ade467fc6adfc13ce9e21d7e50b366fce70ea5f
Author: Julian Eisel
Date:   Sat Aug 1 21:06:58 2015 +0200
Branches: UI-graphical-redesign
https://developer.blender.org/rB4ade467fc6adfc13ce9e21d7e50b366fce70ea5f

Merge branch 'master' into UI-graphical-redesign

Conflicts:
	source/blender/blenkernel/BKE_blender.h
	source/blender/blenloader/intern/versioning_270.c
	source/blender/editors/interface/resources.c
	source/blender/makesdna/DNA_userdef_types.h

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



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

diff --cc source/blender/blenkernel/BKE_blender.h
index 1638ba4,2a9583b..1032e32
--- a/source/blender/blenkernel/BKE_blender.h
+++ b/source/blender/blenkernel/BKE_blender.h
@@@ -42,7 -42,7 +42,7 @@@ extern "C" 
   * and keep comment above the defines.
   * Use STRINGIFY() rather than defining with quotes */
  #define BLENDER_VERSION         275
- #define BLENDER_SUBVERSION      2
 -#define BLENDER_SUBVERSION      4
++#define BLENDER_SUBVERSION      5
  /* Several breakages with 270, e.g. constraint deg vs rad */
  #define BLENDER_MINVERSION      270
  #define BLENDER_MINSUBVERSION   5
diff --cc source/blender/blenloader/intern/versioning_270.c
index b3780ff,1e309f5..571a8cc
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -843,47 -843,12 +843,56 @@@ void blo_do_versions_270(FileData *fd, 
  		}
  	}
  
+ 	if (!MAIN_VERSION_ATLEAST(main, 275, 3)) {
+ 		Brush *br;
+ #define BRUSH_TORUS (1 << 1)
+ 		for (br = main->brush.first; br; br = br->id.next) {
+ 			br->flag &= ~BRUSH_TORUS;
+ 		}
+ #undef BRUSH_TORUS
+ 	}
++
 +	{
 +		bScreen *screen;
 +		for (screen = main->screen.first; screen; screen = screen->id.next) {
 +			ScrArea *sa;
 +
 +			for (sa = screen->areabase.first; sa; sa = sa->next) {
 +				const char needed_type = (sa->spacetype == SPACE_CLIP) ? RGN_TYPE_PREVIEW : RGN_TYPE_WINDOW;
 +				ARegion *ar = BKE_area_find_region_type(sa, needed_type);
 +				SpaceLink *sl;
 +
 +				if (ar == NULL)
 +					continue;
 +
 +				for (sl = sa->spacedata.first; sl; sl = sl->next) {
 +					switch (sl->spacetype) {
 +						case SPACE_TIME:
 +						case SPACE_ACTION:
 +						case SPACE_NLA:
 +							ar->v2d.flag |= V2D_USES_UNITS_HORIZONTAL;
 +							break;
 +						case SPACE_IPO:
 +						case SPACE_SEQ:
 +							ar->v2d.flag |= (V2D_USES_UNITS_HORIZONTAL | V2D_USES_UNITS_VERTICAL);
 +							break;
 +						case SPACE_CLIP:
 +						{
 +							SpaceClip *sc = (SpaceClip *)sl;
 +
 +							if (sc->view == SC_VIEW_DOPESHEET) {
 +								ar->v2d.flag |= V2D_USES_UNITS_HORIZONTAL;
 +							}
 +							else if (sc->view == SC_VIEW_GRAPH) {
 +								ar->v2d.flag |= (V2D_USES_UNITS_HORIZONTAL | V2D_USES_UNITS_VERTICAL);
 +							}
 +							break;
 +						}
 +						default:
 +							break;
 +					}
 +				}
 +			}
 +		}
 +	}
  }
diff --cc source/blender/editors/interface/resources.c
index 88b4395,5eaee73..e8a599c
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@@ -2634,26 -2631,14 +2638,34 @@@ void init_userdef_do_versions(void
  		}
  	}
  
- 	if (U.versionfile < 275 || (U.versionfile == 275 && U.subversionfile < 2)) {
+ 	if (!USER_VERSION_ATLEAST(275, 2)) {
+ 		U.ndof_deadzone = 0.1;
+ 	}
+ 
+ 	if (!USER_VERSION_ATLEAST(275, 4)) {
+ 		U.node_margin = 80;
+ 	}
+ 
++	if (U.versionfile < 275 || (U.versionfile == 275 && U.subversionfile < 5)) {
 +		bTheme *btheme;
 +		ThemeSpace *ts;
 +
 +		for (btheme = U.themes.first; btheme; btheme = btheme->next) {
 +			for (ts = UI_THEMESPACE_START(btheme); ts != UI_THEMESPACE_END(btheme); ts++) {
 +				/* XXX maybe remove show_back/show_header options? */
 +				ts->panelcolors.show_back = ts->panelcolors.show_header = true;
 +				rgba_char_args_set(ts->panelcolors.back, 128, 128, 128, 255);
 +				rgba_char_args_set(ts->panelcolors.header, 97, 97, 97, 255);
 +			}
 +
 +			rgba_char_args_set_fl(btheme->tui.area_edges, 0.10f, 0.10f, 0.10f, 1.0f);
 +
 +			btheme->tui.interface_style = TH_IFACE_STYLE_FLAT;
 +
 +			ui_widget_color_init(&btheme->tui);
 +		}
 +	}
 +
  	if (U.pixelsize == 0.0f)
  		U.pixelsize = 1.0f;
  	
diff --cc source/blender/editors/screen/area.c
index d8f094c,79d6b84..a008f90
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@@ -75,13 -75,10 +75,13 @@@ extern void ui_draw_anti_tria(float x1
  
  /* general area and region code */
  
- static void region_draw_emboss(ARegion *ar, rcti *scirct)
+ static void region_draw_emboss(const ARegion *ar, const rcti *scirct)
  {
  	rcti rect;
 -	
 +
 +	if (!ELEM(ar->regiontype, RGN_TYPE_HEADER, RGN_TYPE_TOOL_PROPS))
 +		return;
 +
  	/* translate scissor rect to region space */
  	rect.xmin = scirct->xmin - ar->winrct.xmin;
  	rect.ymin = scirct->ymin - ar->winrct.ymin;
diff --cc source/blender/makesdna/DNA_userdef_types.h
index de20137,bc2c746..6acc4c6
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@@ -890,11 -887,16 +894,21 @@@ typedef enum eUserpref_VirtualPixel 
  	VIRTUAL_PIXEL_DOUBLE = 1,
  } eUserpref_VirtualPixel;
  
+ typedef enum eOpensubdiv_Computee_Type {
+ 	USER_OPENSUBDIV_COMPUTE_NONE = 0,
+ 	USER_OPENSUBDIV_COMPUTE_CPU = 1,
+ 	USER_OPENSUBDIV_COMPUTE_OPENMP = 2,
+ 	USER_OPENSUBDIV_COMPUTE_OPENCL = 3,
+ 	USER_OPENSUBDIV_COMPUTE_CUDA = 4,
+ 	USER_OPENSUBDIV_COMPUTE_GLSL_TRANSFORM_FEEDBACK = 5,
+ 	USER_OPENSUBDIV_COMPUTE_GLSL_COMPUTE = 6,
+ } eOpensubdiv_Computee_Type;
+ 
 +typedef enum eTheme_InterfaceStyle {
 +	TH_IFACE_STYLE_CLASSIC = 0,
 +	TH_IFACE_STYLE_FLAT    = 1,
 +} eTheme_InterfaceStyle;
 +
  #ifdef __cplusplus
  }
  #endif