[Bf-blender-cvs] [fe85eb5] UI-experiments: Merge branch 'wiggly-widgets' into UI-experiments

[Julian Eisel]

Commit: fe85eb560822addb46c1ed998b77bb5e9e288a35
Author: Julian Eisel
Date:   Tue Aug 25 00:27:50 2015 +0200
Branches: UI-experiments
https://developer.blender.org/rBfe85eb560822addb46c1ed998b77bb5e9e288a35

Merge branch 'wiggly-widgets' into UI-experiments

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

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index 571a8cc,7c02c37..e7c9ab3
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -853,46 -853,41 +853,84 @@@ void blo_do_versions_270(FileData *fd, 
  	}
  
  	{
 +		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;
 +					}
 +				}
 +			}
 +		}
 +	}
++	{
+ 		if (!DNA_struct_elem_find(fd->filesdna, "SpaceNode", "float", "backdrop_zoom")) {
+ 			bScreen *sc;
+ 			for (sc = main->screen.first; sc; sc = sc->id.next) {
+ 				ScrArea *sa;
+ 				for (sa = sc->areabase.first; sa; sa = sa->next) {
+ 					SpaceLink *sl;
+ 					for (sl = sa->spacedata.first; sl; sl = sl->next) {
+ 						if (sl->spacetype == SPACE_NODE) {
+ 							SpaceNode *snode = (SpaceNode *)sl;
+ 							snode->backdrop_zoom = 1.0;
+ 						}
+ 						if (sl->spacetype == SPACE_SEQ) {
+ 							SpaceSeq *sseq = (SpaceSeq *)sl;
+ 							sseq->overdrop_zoom = 1.0;
+ 						}
+ 					}
+ 				}
+ 			}
+ 		}
+ 
+ 		if (!DNA_struct_elem_find(fd->filesdna, "SpaceIpo", "float", "backdrop_zoom")) {
+ 			bScreen *sc;
+ 			for (sc = main->screen.first; sc; sc = sc->id.next) {
+ 				ScrArea *sa;
+ 				for (sa = sc->areabase.first; sa; sa = sa->next) {
+ 					SpaceLink *sl;
+ 					for (sl = sa->spacedata.first; sl; sl = sl->next) {
+ 						if (sl->spacetype == SPACE_IPO) {
+ 							SpaceIpo *sipo = (SpaceIpo *)sl;
+ 							sipo->backdrop_zoom = 1.0f;
+ 							sipo->backdrop_opacity = 0.7f;
+ 						}
+ 					}
+ 				}
+ 			}
+ 		}
+ 	}
  }
diff --cc source/blender/editors/interface/resources.c
index 4273045,d8cf550..02f4eb1
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@@ -2645,55 -2627,15 +2633,64 @@@ void init_userdef_do_versions(void
  		U.node_margin = 80;
  	}
  
 +	if (!USER_VERSION_ATLEAST(275, 6)) {
 +		bTheme *btheme;
 +		ThemeSpace *ts;
 +
 +		/* interface_widgets.c */
 +		struct uiWidgetColors wcol_tab = {
 +			{255, 255, 255, 255},
 +			{83, 83, 83, 255},    /* gets overwritten later */
 +			{114, 114, 114, 255}, /* gets overwritten later */
 +			{90, 90, 90, 255},
 +
 +			{0, 0, 0, 255},       /* gets overwritten later */
 +			{0, 0, 0, 255},
 +
 +			0,
 +			0, 0
 +		};
 +
 +		for (btheme = U.themes.first; btheme; btheme = btheme->next) {
 +			btheme->tui.wcol_tab = wcol_tab;
 +			for (ts = UI_THEMESPACE_START(btheme); ts != UI_THEMESPACE_END(btheme); ts++) {
 +				copy_v4_v4_char(ts->tabs.tab_active, ts->tab_active);
 +				copy_v4_v4_char(ts->tabs.tab_inactive, ts->tab_inactive);
 +				copy_v4_v4_char(ts->tabs.tab_back, ts->tab_back);
 +				copy_v4_v4_char(ts->tabs.tab_outline, ts->tab_outline);
 +			}
 +		}
 +	}
 +
 +	if (!USER_VERSION_ATLEAST(275, 6)) {
 +		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 (!USER_VERSION_ATLEAST(275, 5)) {
+ 		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;