griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Proper solution for crash of GP when marker is not exist on current frame

Browse Source
This commit is contained in:
Sergey Sharybin
2014-02-28 19:05:09 +06:00
parent 45fc0514fb
commit e4996b49f5
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/gpencil/gpencil_paint.c
View File

@@ -1145,7 +1145,7 @@ static int gp_session_initdata(bContext *C, tGPsdata *p)
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);
MovieTrackingMarker *marker = BKE_tracking_marker_get(track, framenr);
p->imat[3][0] -= marker->pos[0];
p->imat[3][1] -= marker->pos[1];

10
source/blender/editors/space_clip/clip_draw.c
View File

@@ -1635,14 +1635,12 @@ static void draw_distortion(SpaceClip *sc, ARegion *ar, MovieClip *clip,
if (track) {
int framenr = ED_space_clip_get_clip_frame_number(sc);
MovieTrackingMarker *marker = BKE_tracking_marker_get_exact(track, framenr);
MovieTrackingMarker *marker = BKE_tracking_marker_get(track, framenr);
if (marker) {
offsx = marker->pos[0];
offsy = marker->pos[1];
offsx = marker->pos[0];
offsy = marker->pos[1];
gpd = track->gpd;
}
gpd = track->gpd;
}
}