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

[Julian Eisel]

Commit: 1146d40937ef0696c4ccac6722856ed01d3122f9
Author: Julian Eisel
Date:   Fri Apr 15 22:48:09 2016 +0200
Branches: wiggly-widgets
https://developer.blender.org/rB1146d40937ef0696c4ccac6722856ed01d3122f9

Merge branch 'master' into wiggly-widgets

Conflicts:
	source/blender/editors/space_graph/graph_ops.c

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index c7f6730,18740d4..7682643
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1072,44 -1072,17 +1072,56 @@@ void blo_do_versions_270(FileData *fd, 
  				}
  			}
  		}
+ 
+ 		for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
+ 			CurvePaintSettings *cps = &scene->toolsettings->curve_paint_settings;
+ 			if (cps->error_threshold == 0) {
+ 				cps->curve_type = CU_BEZIER;
+ 				cps->flag |= CURVE_PAINT_FLAG_CORNERS_DETECT;
+ 				cps->error_threshold = 8;
+ 				cps->radius_max = 1.0f;
+ 				cps->corner_angle = DEG2RADF(70.0f);
+ 			}
+ 		}
+ 
  	}
 +
 +	{
 +		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/space_graph/graph_ops.c
index 8735fdd,7ffa825..10ca57d
--- a/source/blender/editors/space_graph/graph_ops.c
+++ b/source/blender/editors/space_graph/graph_ops.c
@@@ -459,7 -459,9 +459,11 @@@ void graphedit_operatortypes(void
  	WM_operatortype_append(GRAPH_OT_fmodifier_copy);
  	WM_operatortype_append(GRAPH_OT_fmodifier_paste);
  	
+ 	/* Drivers */
+ 	WM_operatortype_append(GRAPH_OT_driver_variables_copy);
+ 	WM_operatortype_append(GRAPH_OT_driver_variables_paste);
++
 +	WM_operatortype_append(GRAPH_OT_widget_backdrop_transform);
  }
  
  void ED_operatormacros_graph(void)