diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-06-20 14:54:56 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-06-20 14:54:56 +0400 |
| commit | 470ad6fc0e729e335718d1152e2348db159e4514 (patch) | |
| tree | 60ab5ebe8ce11cc193e28d9b599da5cbdd072d65 /source/blender/editors/space_clip | |
| parent | b07edbc6d6f3796fbf3d036582a1beec35e08a59 (diff) | |
Do not check result of BKE_tracking_marker_get -- it shall always
return valid marker. If not -- let blender crash, because that means
something went really bad and silencing this isn't good idea.
Also made mask parenting to tracking data aware of clip's start frame.
Diffstat (limited to 'source/blender/editors/space_clip')
| -rw-r--r-- | source/blender/editors/space_clip/clip_draw.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c index 5d187680b38..37da40e11b3 100644 --- a/source/blender/editors/space_clip/clip_draw.c +++ b/source/blender/editors/space_clip/clip_draw.c @@ -1497,11 +1497,9 @@ void clip_draw_grease_pencil(bContext *C, int onlyv2d) if (track) { 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) { - glTranslatef(marker->pos[0], marker->pos[1], 0.0f); - } + + glTranslatef(marker->pos[0], marker->pos[1], 0.0f); } } |