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>2012-07-27 15:07:12 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-07-27 15:07:12 +0400
commit18e874798d68e4796146e9f5958f66dc3ea61909 (patch)
tree8fac06b4ab2345a1e9baa85f92fad7d06dae7ac6 /source/blender/compositor/nodes/COM_TrackPositionNode.cpp
parentd0b387a0dfcb259a36d7bff3c6bdd63ee0e5a1d9 (diff)
Track input node: more control on over output value
Now supports output value of: - Absolute marker position - Marker position relative to the very first marker - Marker position relative to given scene frame
Diffstat (limited to 'source/blender/compositor/nodes/COM_TrackPositionNode.cpp')
-rw-r--r--source/blender/compositor/nodes/COM_TrackPositionNode.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/compositor/nodes/COM_TrackPositionNode.cpp b/source/blender/compositor/nodes/COM_TrackPositionNode.cpp
index 58b26eb7128..f4efcfe27f0 100644
--- a/source/blender/compositor/nodes/COM_TrackPositionNode.cpp
+++ b/source/blender/compositor/nodes/COM_TrackPositionNode.cpp
@@ -52,14 +52,16 @@ void TrackPositionNode::convertToOperations(ExecutionSystem *graph, CompositorCo
operationX->setTrackName(trackpos_data->track_name);
operationX->setFramenumber(context->getFramenumber());
operationX->setAxis(0);
- operationX->setRelative(editorNode->custom1);
+ operationX->setPosition(editorNode->custom1);
+ operationX->setRelativeFrame(editorNode->custom2);
operationY->setMovieClip(clip);
operationY->setTrackingObject(trackpos_data->tracking_object);
operationY->setTrackName(trackpos_data->track_name);
operationY->setFramenumber(context->getFramenumber());
operationY->setAxis(1);
- operationY->setRelative(editorNode->custom1);
+ operationY->setPosition(editorNode->custom1);
+ operationY->setRelativeFrame(editorNode->custom2);
outputX->relinkConnections(operationX->getOutputSocket());
outputY->relinkConnections(operationY->getOutputSocket());