diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-01-09 14:52:13 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-01-09 14:52:13 +0300 |
| commit | 83e84b2c2c7c105074b7638af6f783603971e595 (patch) | |
| tree | 423ae97ff8178dc156e331eb018b3d82c6e2f83c /source/blender/editors/space_clip | |
| parent | 375d27f230e41e4bcb53183082739c580f74c709 (diff) | |
| parent | ce0fcf1378b6bdd01ff8fbcbccc31b00aa263e25 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_clip')
| -rw-r--r-- | source/blender/editors/space_clip/tracking_ops.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_clip/tracking_select.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c index 4dd96a838e0..4ca2b54eaaf 100644 --- a/source/blender/editors/space_clip/tracking_ops.c +++ b/source/blender/editors/space_clip/tracking_ops.c @@ -1859,6 +1859,10 @@ static bool is_track_clean(MovieTrackingTrack *track, int frames, int del) } } + if (count == 0) { + ok = 0; + } + if (del) { MEM_freeN(track->markers); diff --git a/source/blender/editors/space_clip/tracking_select.c b/source/blender/editors/space_clip/tracking_select.c index eddd65475a2..4ee85ace271 100644 --- a/source/blender/editors/space_clip/tracking_select.c +++ b/source/blender/editors/space_clip/tracking_select.c @@ -906,7 +906,7 @@ void CLIP_OT_select_all(wmOperatorType *ot) /********************** select grouped operator *********************/ -static int select_groped_exec(bContext *C, wmOperator *op) +static int select_grouped_exec(bContext *C, wmOperator *op) { SpaceClip *sc = CTX_wm_space_clip(C); MovieClip *clip = ED_space_clip_get_clip(sc); @@ -989,7 +989,7 @@ void CLIP_OT_select_grouped(wmOperatorType *ot) ot->idname = "CLIP_OT_select_grouped"; /* api callbacks */ - ot->exec = select_groped_exec; + ot->exec = select_grouped_exec; ot->poll = ED_space_clip_tracking_poll; /* flags */ |