[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48112] trunk/blender/source/blender/ editors: Grease pencil and manual calibration weren' t aware of clip start frame

[Sergey Sharybin]

Revision: 48112
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48112
Author:   nazgul
Date:     2012-06-20 10:42:41 +0000 (Wed, 20 Jun 2012)
Log Message:
-----------
Grease pencil and manual calibration weren't aware of clip start frame

Modified Paths:
--------------
    trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
    trunk/blender/source/blender/editors/space_clip/clip_draw.c
    trunk/blender/source/blender/editors/space_clip/clip_editor.c
    trunk/blender/source/blender/editors/transform/transform_generics.c

Modified: trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/gpencil_paint.c	2012-06-20 10:28:51 UTC (rev 48111)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_paint.c	2012-06-20 10:42:41 UTC (rev 48112)
@@ -56,6 +56,7 @@
 #include "ED_gpencil.h"
 #include "ED_screen.h"
 #include "ED_view3d.h"
+#include "ED_clip.h"
 
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
@@ -1032,8 +1033,9 @@
 			p->custom_color[3] = 0.9f;
 			
 			if (sc->gpencil_src == SC_GPENCIL_SRC_TRACK) {
-				int framenr = sc->user.framenr;
-				MovieTrackingTrack *track = BKE_tracking_track_get_active(&sc->clip->tracking);
+				MovieClip *clip = ED_space_clip_get_clip(sc);
+				int framenr = ED_space_clip_get_clip_frame_number(sc);
+				MovieTrackingTrack *track = BKE_tracking_track_get_active(&clip->tracking);
 				MovieTrackingMarker *marker = BKE_tracking_marker_get_exact(track, framenr);
 				
 				p->imat[3][0] -= marker->pos[0];

Modified: trunk/blender/source/blender/editors/space_clip/clip_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_draw.c	2012-06-20 10:28:51 UTC (rev 48111)
+++ trunk/blender/source/blender/editors/space_clip/clip_draw.c	2012-06-20 10:42:41 UTC (rev 48112)
@@ -1318,7 +1318,7 @@
 		MovieTrackingTrack *track = BKE_tracking_track_get_active(&sc->clip->tracking);
 
 		if (track) {
-			int framenr = sc->user.framenr;
+			int framenr = ED_space_clip_get_clip_frame_number(sc);
 			MovieTrackingMarker *marker = BKE_tracking_marker_get_exact(track, framenr);
 
 			offsx = marker->pos[0];
@@ -1496,7 +1496,7 @@
 				MovieTrackingTrack *track = BKE_tracking_track_get_active(&sc->clip->tracking);
 
 				if (track) {
-					int framenr = sc->user.framenr;
+					int framenr = ED_space_clip_get_clip_frame_number(sc);
 					/* don't get the exact marker since it may not exist for the frame */
 					MovieTrackingMarker *marker = BKE_tracking_marker_get(track, framenr);
 					if (marker) {

Modified: trunk/blender/source/blender/editors/space_clip/clip_editor.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_editor.c	2012-06-20 10:28:51 UTC (rev 48111)
+++ trunk/blender/source/blender/editors/space_clip/clip_editor.c	2012-06-20 10:42:41 UTC (rev 48112)
@@ -265,6 +265,7 @@
 	MovieTrackingTrack *track;
 	int width, height, ok = FALSE;
 	ListBase *tracksbase = BKE_tracking_get_active_tracks(&clip->tracking);
+	int framenr = ED_space_clip_get_clip_frame_number(sc);
 
 	INIT_MINMAX2(min, max);
 
@@ -273,7 +274,7 @@
 	track = tracksbase->first;
 	while (track) {
 		if (TRACK_VIEW_SELECTED(sc, track)) {
-			MovieTrackingMarker *marker = BKE_tracking_marker_get(track, sc->user.framenr);
+			MovieTrackingMarker *marker = BKE_tracking_marker_get(track, framenr);
 
 			if (marker) {
 				float pos[3];

Modified: trunk/blender/source/blender/editors/transform/transform_generics.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_generics.c	2012-06-20 10:28:51 UTC (rev 48111)
+++ trunk/blender/source/blender/editors/transform/transform_generics.c	2012-06-20 10:42:41 UTC (rev 48112)
@@ -643,7 +643,7 @@
 		MovieClip *clip = ED_space_clip_get_clip(sc);
 		ListBase *tracksbase = BKE_tracking_get_active_tracks(&clip->tracking);
 		MovieTrackingTrack *track;
-		int framenr = sc->user.framenr;
+		int framenr = ED_space_clip_get_clip_frame_number(sc);
 
 		flushTransTracking(t);