Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-01-27 18:25:22 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-01-27 18:26:50 +0300
commita621926694e7b955f2a75a18ba4ddfaaf01c1973 (patch)
tree0fecb8e95219b63a30ed8970e6ca59945eeff025 /source/blender/editors/space_clip
parentfa9ba68a2b4de3eb65de9a410ae4bd2186443b83 (diff)
Tracking: Remove unfinished code from automation experiments
Diffstat (limited to 'source/blender/editors/space_clip')
-rw-r--r--source/blender/editors/space_clip/tracking_ops_track.c21
1 files changed, 2 insertions, 19 deletions
diff --git a/source/blender/editors/space_clip/tracking_ops_track.c b/source/blender/editors/space_clip/tracking_ops_track.c
index f5fb415c34f..368cbeaf955 100644
--- a/source/blender/editors/space_clip/tracking_ops_track.c
+++ b/source/blender/editors/space_clip/tracking_ops_track.c
@@ -319,23 +319,11 @@ static int track_markers(bContext *C, wmOperator *op, bool use_job)
TrackMarkersJob *tmj;
ScrArea *sa = CTX_wm_area(C);
SpaceClip *sc = CTX_wm_space_clip(C);
- MovieClip *clip;
+ MovieClip *clip = ED_space_clip_get_clip(sc);
wmJob *wm_job;
bool backwards = RNA_boolean_get(op->ptr, "backwards");
bool sequence = RNA_boolean_get(op->ptr, "sequence");
- int framenr;
-
- if (sc == NULL) {
- /* TODO(sergey): Support clip for invoke as well. */
- BKE_report(op->reports, RPT_ERROR,
- "Invoking this operator only supported from "
- "Clip Editor space");
- return OPERATOR_CANCELLED;
- }
-
- clip = ED_space_clip_get_clip(sc);
- BLI_assert(clip != NULL);
- framenr = ED_space_clip_get_clip_frame_number(sc);
+ int framenr = ED_space_clip_get_clip_frame_number(sc);
if (WM_jobs_test(CTX_wm_manager(C), sa, WM_JOB_TYPE_ANY)) {
/* Only one tracking is allowed at a time. */
@@ -433,8 +421,6 @@ static int track_markers_modal(bContext *C,
void CLIP_OT_track_markers(wmOperatorType *ot)
{
- PropertyRNA *prop;
-
/* identifiers */
ot->name = "Track Markers";
ot->description = "Track selected markers";
@@ -455,9 +441,6 @@ void CLIP_OT_track_markers(wmOperatorType *ot)
RNA_def_boolean(ot->srna, "sequence", 0, "Track Sequence",
"Track marker during image sequence rather than "
"single image");
- prop = RNA_def_string(ot->srna, "clip", NULL, MAX_NAME, "Movie Clip",
- "Movie Clip to be tracked");
- RNA_def_property_flag(prop, PROP_SKIP_SAVE);
}
/********************** Refine track position operator *********************/