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

[Julian Eisel]

Commit: 701689f3542fa3c00acc34e3536c1d705e756a56
Author: Julian Eisel
Date:   Thu Nov 10 23:17:57 2016 +0100
Branches: custom-manipulators
https://developer.blender.org/rB701689f3542fa3c00acc34e3536c1d705e756a56

Merge branch 'blender2.8' into custom-manipulators

Conflicts:
	source/blender/blenloader/intern/versioning_270.c
	source/blender/windowmanager/manipulators/intern/wm_manipulatormap.c

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index 6259012,529233c..f10c59f
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1339,41 -1340,40 +1340,79 @@@ void blo_do_versions_270(FileData *fd, 
  	}
  
  	{
+ 		if (!DNA_struct_elem_find(fd->filesdna, "View3DDebug", "char", "background")) {
+ 			bScreen *screen;
+ 
+ 			for (screen = main->screen.first; screen; screen = screen->id.next) {
+ 				ScrArea *sa;
+ 				for (sa = screen->areabase.first; sa; sa = sa->next) {
+ 					SpaceLink *sl;
+ 
+ 					for (sl = sa->spacedata.first; sl; sl = sl->next) {
+ 						switch (sl->spacetype) {
+ 							case SPACE_VIEW3D:
+ 							{
+ 								View3D *v3d = (View3D *)sl;
+ 								v3d->debug.background = V3D_DEBUG_BACKGROUND_NONE;
+ 							}
+ 						}
+ 					}
+ 				}
+ 			}
+ 		}
+ 
+ 		if (!DNA_struct_elem_find(fd->filesdna, "RigidBodyCon", "float", "spring_stiffness_ang_x")) {
+ 			Object *ob;
+ 			for (ob = main->object.first; ob; ob = ob->id.next) {
+ 				RigidBodyCon *rbc = ob->rigidbody_constraint;
+ 				if (rbc) {
+ 					rbc->spring_stiffness_ang_x = 10.0;
+ 					rbc->spring_stiffness_ang_y = 10.0;
+ 					rbc->spring_stiffness_ang_z = 10.0;
+ 					rbc->spring_damping_ang_x = 0.5;
+ 					rbc->spring_damping_ang_y = 0.5;
+ 					rbc->spring_damping_ang_z = 0.5;
+ 				}
+ 			}
+ 		}
+ 	}
++
++	{
 +		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_view3d/view3d_draw.c
index 0fd07ab,e843d3c..4da496c
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@@ -1599,8 -1792,12 +1799,12 @@@ static void view3d_draw_view(const bCon
  	view3d_draw_other_elements(C, ar);
  	view3d_draw_tool_ui(C);
  	view3d_draw_reference_images(C);
 -	view3d_draw_manipulator(C);
 +	view3d_draw_manipulators(C, ar);
  	view3d_draw_region_info(C, ar);
+ 
+ #if VIEW3D_DRAW_DEBUG
+ 	view3d_draw_debug(C, ar, draw_data);
+ #endif
  }
  
  void view3d_main_region_draw(const bContext *C, ARegion *ar)