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

[Campbell Barton]

Commit: 2b94f1d07342bf5217d376ab12a956502e53098f
Author: Campbell Barton
Date:   Fri Mar 31 18:09:52 2017 +1100
Branches: custom-manipulators
https://developer.blender.org/rB2b94f1d07342bf5217d376ab12a956502e53098f

Merge branch 'blender2.8' into custom-manipulators

This removes graph 3d render feature, also use same variables as master
for SpaceNode.

The feature (could be added back if needed),
but didn't get such a positive functionality review, see D1781,
although this is still an open topic.

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index 9fa68df997d,12045dfdb83..8f8d287265f
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1622,45 -1622,6 +1622,24 @@@ void blo_do_versions_270(FileData *fd, 
  			}
  		}
  	}
 +
 +	{
- 		if (!DNA_struct_elem_find(fd->filesdna, "SpaceNode", "float", "backdrop_zoom")) {
++		if (!DNA_struct_elem_find(fd->filesdna, "SpaceSeq", "float", "overdrop_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;
- 						}
- 					}
- 				}
- 			}
- 		}
 +	}
  }
  
  void do_versions_after_linking_270(Main *main)
diff --cc source/blender/makesrna/intern/rna_space.c
index 4e62bf8cfb1,07a1a73358d..a3c99b68199
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@@ -4471,9 -4443,14 +4455,10 @@@ static void rna_def_space_node(BlenderR
  	RNA_def_property_ui_text(prop, "Backdrop Zoom", "Backdrop zoom factor");
  	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_NODE_VIEW, NULL);
  	
 -	prop = RNA_def_property(srna, "backdrop_x", PROP_FLOAT, PROP_NONE);
 +	prop = RNA_def_property(srna, "backdrop_offset", PROP_FLOAT, PROP_NONE);
+ 	RNA_def_property_float_sdna(prop, NULL, "xof");
 -	RNA_def_property_ui_text(prop, "Backdrop X", "Backdrop X offset");
 -	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_NODE_VIEW, NULL);
 -
 -	prop = RNA_def_property(srna, "backdrop_y", PROP_FLOAT, PROP_NONE);
 -	RNA_def_property_float_sdna(prop, NULL, "yof");
 -	RNA_def_property_ui_text(prop, "Backdrop Y", "Backdrop Y offset");
 +	RNA_def_property_array(prop, 2);
 +	RNA_def_property_ui_text(prop, "Backdrop Offset", "Backdrop offset");
  	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_NODE_VIEW, NULL);
  
  	prop = RNA_def_property(srna, "backdrop_channels", PROP_ENUM, PROP_NONE);