diff options
Diffstat (limited to 'source/blender/compositor/operations/COM_TrackPositionOperation.cpp')
| -rw-r--r-- | source/blender/compositor/operations/COM_TrackPositionOperation.cpp | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/source/blender/compositor/operations/COM_TrackPositionOperation.cpp b/source/blender/compositor/operations/COM_TrackPositionOperation.cpp index ca169d03fbc..f9db897deba 100644 --- a/source/blender/compositor/operations/COM_TrackPositionOperation.cpp +++ b/source/blender/compositor/operations/COM_TrackPositionOperation.cpp @@ -45,6 +45,7 @@ TrackPositionOperation::TrackPositionOperation() : NodeOperation() this->m_axis = 0; this->m_position = CMP_TRACKPOS_ABSOLUTE; this->m_relativeFrame = 0; + this->m_speed_output = false; } void TrackPositionOperation::initExecution() @@ -78,7 +79,25 @@ void TrackPositionOperation::initExecution() copy_v2_v2(this->m_markerPos, marker->pos); - if (this->m_position == CMP_TRACKPOS_RELATIVE_START) { + if (this->m_speed_output) { + int relative_clip_framenr = + BKE_movieclip_remap_scene_to_clip_frame( + this->m_movieClip, + this->m_relativeFrame); + + marker = BKE_tracking_marker_get_exact(track, + relative_clip_framenr); + if (marker != NULL && (marker->flag & MARKER_DISABLED) == 0) { + copy_v2_v2(this->m_relativePos, marker->pos); + } + else { + copy_v2_v2(this->m_relativePos, this->m_markerPos); + } + if (this->m_relativeFrame < this->m_framenumber) { + swap_v2_v2(this->m_relativePos, this->m_markerPos); + } + } + else if (this->m_position == CMP_TRACKPOS_RELATIVE_START) { int i; for (i = 0; i < track->markersnr; i++) { |