From e4996b49f5e0cdf9caacaae50e284e51d8250136 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 28 Feb 2014 19:05:09 +0600 Subject: Proper solution for crash of GP when marker is not exist on current frame --- source/blender/editors/gpencil/gpencil_paint.c | 2 +- source/blender/editors/space_clip/clip_draw.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'source') diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index d808c91d4e7..05d56458a3f 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -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]; diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c index 8c015a71d30..d8ccac730c8 100644 --- a/source/blender/editors/space_clip/clip_draw.c +++ b/source/blender/editors/space_clip/clip_draw.c @@ -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; } } -- cgit v1.2.3