fix for parenting, offset isnt needed anymore

4 files changed, 4 insertions, 13 deletions

diff --git a/source/blender/blenkernel/intern/mask.c b/source/blender/blenkernel/intern/mask.c
index 236fc4825ca..ffd2630742d 100644
--- a/source/blender/blenkernel/intern/mask.c
+++ b/source/blender/blenkernel/intern/mask.c
@@ -877,7 +877,6 @@ static int BKE_mask_evaluate_parent(MaskParent *parent, float ctime, float r_co[
 				if (track) {
 					MovieTrackingMarker *marker = BKE_tracking_get_marker(track, ctime);
 					BKE_mask_coord_from_movieclip(clip, &user, r_co, marker->pos);
-					add_v2_v2(r_co, parent->offset);
 
 					return TRUE;
 				}
diff --git a/source/blender/editors/mask/mask_draw.c b/source/blender/editors/mask/mask_draw.c
index 34c478dceaa..fe11ded64f4 100644
--- a/source/blender/editors/mask/mask_draw.c
+++ b/source/blender/editors/mask/mask_draw.c
@@ -62,6 +62,7 @@ static void set_spline_color(MaskObject *maskobj, MaskSpline *spline)
 	}
 }
 
+#if 0
 static void draw_spline_parents(MaskObject *UNUSED(maskobj), MaskSpline *spline)
 {
 	int i;
@@ -93,6 +94,7 @@ static void draw_spline_parents(MaskObject *UNUSED(maskobj), MaskSpline *spline)
 
 	glDisable(GL_LINE_STIPPLE);
 }
+#endif
 
 /* return non-zero if spline is selected */
 static void draw_spline_points(MaskObject *maskobj, MaskSpline *spline)
@@ -272,7 +274,7 @@ static void draw_maskobjs(Mask *mask)
 			/* draw curve itself first... */
 			draw_spline_curve(maskobj, spline);
 
-			draw_spline_parents(maskobj, spline);
+//			draw_spline_parents(maskobj, spline);
 
 			/* ...and then handles over the curve so they're nicely visible */
 			draw_spline_points(maskobj, spline);
@@ -283,7 +285,7 @@ static void draw_maskobjs(Mask *mask)
 
 				spline->points_deform = NULL;
 				draw_spline_curve(maskobj, spline);
-				draw_spline_parents(maskobj, spline);
+//				draw_spline_parents(maskobj, spline);
 				draw_spline_points(maskobj, spline);
 				spline->points_deform = back;
 			}
diff --git a/source/blender/editors/mask/mask_relationships.c b/source/blender/editors/mask/mask_relationships.c
index 9d3195a26de..96782c5b294 100644
--- a/source/blender/editors/mask/mask_relationships.c
+++ b/source/blender/editors/mask/mask_relationships.c
@@ -135,7 +135,6 @@ static int mask_parent_set_exec(bContext *C, wmOperator *UNUSED(op))
 
 				if (MASKPOINT_ISSEL(point)) {
 					BezTriple *bezt = &point->bezt;
-					float tvec[2];
 
 					point->parent.id_type = ID_MC;
 					point->parent.id = &clip->id;
@@ -144,13 +143,6 @@ static int mask_parent_set_exec(bContext *C, wmOperator *UNUSED(op))
 
 					point->parent.flag |= MASK_PARENT_ACTIVE;
 
-					sub_v2_v2v2(tvec, parmask_pos, bezt->vec[1]);
-
-					add_v2_v2(bezt->vec[0], tvec);
-					add_v2_v2(bezt->vec[1], tvec);
-					add_v2_v2(bezt->vec[2], tvec);
-
-					negate_v2_v2(point->parent.offset, tvec);
 					copy_v2_v2(point->parent.parent_orig, parmask_pos);
 				}
 			}
diff --git a/source/blender/makesdna/DNA_mask_types.h b/source/blender/makesdna/DNA_mask_types.h
index eef7a024d72..cf3f5e77544 100644
--- a/source/blender/makesdna/DNA_mask_types.h
+++ b/source/blender/makesdna/DNA_mask_types.h
@@ -57,8 +57,6 @@ typedef struct MaskParent {
 	                       * in case of parenting to movie tracking data contains name of object */
 	char sub_parent[64];  /* sub-entity of parent to which parenting happened
 	                       * in case of parenting to movie tracking data contains name of track */
-	float offset[2];      /* offset from parent position, so object/control point can be parented to a
-	                       * motion track and also be animated (see ZanQdo's request below)  */
 	float parent_orig[2]; /* track location at the moment of parenting */
 } MaskParent;