More Driver Fixes:

* Fixed Driver version-patching code to work correctly again with the new system.

* Fix for bug #20484, by adding a new driver variable type ('Transform Channel') which makes it easier to use object/bone transforms as in the past. The main differences with using this (compared with the 'Single Prop' type) are that this allows for 'final' transforms to get used instead (i.e. constraints are also taken into account), and also that this variable type can only be used for transforms (more limited scope -> less flexibility -> point-n-click goodies can follow). Mancandy now loads correctly again.

* Added toggle for local vs worldspace transforms when working with Rot/Loc Diff variable types, and also for the newly added Transform Channel

* Removed some dead code from sequencer...

2 files changed, 37 insertions, 52 deletions

diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c
index c42dfd0015d..c7c58689a5f 100644
--- a/source/blender/editors/space_graph/graph_buttons.c
+++ b/source/blender/editors/space_graph/graph_buttons.c
@@ -352,7 +352,7 @@ static void graph_panel_driverVar__rotDiff(const bContext *C, uiLayout *layout,
 		if (dtar->id && ob1->pose) {
 			PointerRNA tar_ptr;
 			
-			RNA_pointer_create(dtar2->id, &RNA_Pose, ob1->pose, &tar_ptr);
+			RNA_pointer_create(dtar->id, &RNA_Pose, ob1->pose, &tar_ptr);
 			uiItemPointerR(col, "", ICON_BONE_DATA, &dtar_ptr, "bone_target", &tar_ptr, "bones");
 		}
 	
@@ -367,7 +367,7 @@ static void graph_panel_driverVar__rotDiff(const bContext *C, uiLayout *layout,
 		}
 }
 
-/* settings for 'rotation difference' driver variable type */
+/* settings for 'location difference' driver variable type */
 static void graph_panel_driverVar__locDiff(const bContext *C, uiLayout *layout, ID *id, DriverVar *dvar)
 {
 	DriverTarget *dtar= &dvar->targets[0];
@@ -388,9 +388,11 @@ static void graph_panel_driverVar__locDiff(const bContext *C, uiLayout *layout,
 		if (dtar->id && ob1->pose) {
 			PointerRNA tar_ptr;
 			
-			RNA_pointer_create(dtar2->id, &RNA_Pose, ob1->pose, &tar_ptr);
+			RNA_pointer_create(dtar->id, &RNA_Pose, ob1->pose, &tar_ptr);
 			uiItemPointerR(col, "", ICON_BONE_DATA, &dtar_ptr, "bone_target", &tar_ptr, "bones");
 		}
+		
+		uiItemR(col, NULL, 0, &dtar_ptr, "use_local_space_transforms", 0);
 	
 	col= uiLayoutColumn(layout, 1);
 		uiTemplateAnyID(col, (bContext *)C, &dtar2_ptr, "id", "id_type", "Ob/Bone 2:");
@@ -401,6 +403,35 @@ static void graph_panel_driverVar__locDiff(const bContext *C, uiLayout *layout,
 			RNA_pointer_create(dtar2->id, &RNA_Pose, ob2->pose, &tar_ptr);
 			uiItemPointerR(col, "", ICON_BONE_DATA, &dtar2_ptr, "bone_target", &tar_ptr, "bones");
 		}
+		
+		uiItemR(col, NULL, 0, &dtar2_ptr, "use_local_space_transforms", 0);
+}
+
+/* settings for 'transform channel' driver variable type */
+static void graph_panel_driverVar__transChan(const bContext *C, uiLayout *layout, ID *id, DriverVar *dvar)
+{
+	DriverTarget *dtar= &dvar->targets[0];
+	Object *ob = (Object *)dtar->id;
+	PointerRNA dtar_ptr;
+	uiLayout *col, *row;
+	
+	/* initialise RNA pointer to the target */
+	RNA_pointer_create(id, &RNA_DriverTarget, dtar, &dtar_ptr); 
+	
+	/* properties */
+	col= uiLayoutColumn(layout, 1);
+		uiTemplateAnyID(col, (bContext *)C, &dtar_ptr, "id", "id_type", "Ob/Bone:");
+		
+		if (dtar->id && ob->pose) {
+			PointerRNA tar_ptr;
+			
+			RNA_pointer_create(dtar->id, &RNA_Pose, ob->pose, &tar_ptr);
+			uiItemPointerR(col, "", ICON_BONE_DATA, &dtar_ptr, "bone_target", &tar_ptr, "bones");
+		}
+		
+		row= uiLayoutRow(layout, 1);
+			uiItemR(row, NULL, 0, &dtar_ptr, "transform_type", 0);
+			uiItemR(row, NULL, 0, &dtar_ptr, "use_local_space_transforms", 0);
 }
 
 /* driver settings for active F-Curve (only for 'Drivers' mode) */
@@ -503,6 +534,9 @@ static void graph_panel_drivers(const bContext *C, Panel *pa)
 				case DVAR_TYPE_LOC_DIFF: /* location difference */
 					graph_panel_driverVar__locDiff(C, box, ale->id, dvar);
 					break;
+				case DVAR_TYPE_TRANSFORM_CHAN: /* transform channel */
+					graph_panel_driverVar__transChan(C, box, ale->id, dvar);
+					break;
 			}
 	}
 	
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index 0f3adae8c20..bd1db4c29b6 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -382,55 +382,6 @@ Sequence *find_nearest_seq(Scene *scene, View2D *v2d, int *hand, short mval[2])
 	return 0;
 }
 
-void update_seq_ipo_rect(Scene *scene, View2D *v2d, Sequence *seq)
-{
-	float start;
-	float end;
-
-	if (!seq || !seq->ipo) {
-		return;
-	}
-	start =  -5.0;
-	end   =  105.0;
-
-	
-	/* Adjust IPO window to sequence and 
-	   avoid annoying snap-back to startframe 
-	   when Lock Time is on */
-	if (0) { // XXX v2d->flag & V2D_VIEWLOCK) {
-		if ((seq->flag & SEQ_IPO_FRAME_LOCKED) != 0) {
-			start = -5.0 + seq->startdisp;
-			end = 5.0 + seq->enddisp;
-		} else {
-			start = (float)scene->r.sfra - 0.1;
-			end = scene->r.efra;
-		}
-	}
-
-	seq->ipo->cur.xmin= start;
-	seq->ipo->cur.xmax= end;
-}
-
-void update_seq_icu_rects(Sequence * seq)
-{
-	IpoCurve *icu= NULL;
-	struct SeqEffectHandle sh;
-
-	if (!seq || !seq->ipo) {
-		return;
-	}
-
-	if(!(seq->type & SEQ_EFFECT)) {
-		return;
-	}
-
-	sh = get_sequence_effect(seq);
-
-	for(icu= seq->ipo->curve.first; icu; icu= icu->next) {
-		sh.store_icu_yrange(seq, icu->adrcode, &icu->ymin, &icu->ymax);
-	}
-}
-
 
 static int seq_is_parent(Sequence *par, Sequence *seq)
 {