[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47176] branches/soc-2011-tomato/source/ blender: support for marker parent offset

[Campbell Barton]

Revision: 47176
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47176
Author:   campbellbarton
Date:     2012-05-29 13:23:34 +0000 (Tue, 29 May 2012)
Log Message:
-----------
support for marker parent offset 

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
    branches/soc-2011-tomato/source/blender/editors/mask/mask_relationships.c

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c	2012-05-29 13:18:11 UTC (rev 47175)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c	2012-05-29 13:23:34 UTC (rev 47176)
@@ -876,7 +876,9 @@
 
 				if (track) {
 					MovieTrackingMarker *marker = BKE_tracking_get_marker(track, ctime);
-					BKE_mask_coord_from_movieclip(clip, &user, r_co, marker->pos);
+					float marker_pos_ofs[2];
+					add_v2_v2v2(marker_pos_ofs, marker->pos, track->offset);
+					BKE_mask_coord_from_movieclip(clip, &user, r_co, marker_pos_ofs);
 
 					return TRUE;
 				}
@@ -1235,8 +1237,6 @@
 					*point_deform = *point;
 					point_deform->uw = point->uw ? MEM_dupallocN(point->uw) : NULL;
 
-					print_v2("", delta);
-
 					add_v2_v2(point_deform->bezt.vec[0], delta);
 					add_v2_v2(point_deform->bezt.vec[1], delta);
 					add_v2_v2(point_deform->bezt.vec[2], delta);

Modified: branches/soc-2011-tomato/source/blender/editors/mask/mask_relationships.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/mask/mask_relationships.c	2012-05-29 13:18:11 UTC (rev 47175)
+++ branches/soc-2011-tomato/source/blender/editors/mask/mask_relationships.c	2012-05-29 13:23:34 UTC (rev 47176)
@@ -112,6 +112,7 @@
 	MovieTrackingObject *tracking;
 	/* done */
 
+	float marker_pos_ofs[2];
 	float parmask_pos[2];
 
 	if ((NULL == (sc = CTX_wm_space_clip(C))) ||
@@ -123,8 +124,10 @@
 		return OPERATOR_CANCELLED;
 	}
 
-	BKE_mask_coord_from_movieclip(clip, &sc->user, parmask_pos, marker->pos);
+	add_v2_v2v2(marker_pos_ofs, marker->pos, track->offset);
 
+	BKE_mask_coord_from_movieclip(clip, &sc->user, parmask_pos, marker_pos_ofs);
+
 	for (maskobj = mask->maskobjs.first; maskobj; maskobj = maskobj->next) {
 		MaskSpline *spline;
 		int i;
@@ -134,8 +137,6 @@
 				MaskSplinePoint *point = &spline->points[i];
 
 				if (MASKPOINT_ISSEL(point)) {
-					BezTriple *bezt = &point->bezt;
-
 					point->parent.id_type = ID_MC;
 					point->parent.id = &clip->id;
 					strcpy(point->parent.parent, tracking->name);