diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-06-15 11:50:27 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-15 11:50:27 +0400 |
| commit | 46ea5670db378048fc1339b5e355523842fa82a2 (patch) | |
| tree | 45124626abbb8d43fce2e3f0f89b9067590a3def /source/blender/compositor/nodes/COM_ScaleNode.cpp | |
| parent | e879ee1798151301765bcdf6b2e6c67718a782a8 (diff) | |
scale node - framing offset: compatible with camera shiftX/Y and the viewport option.
Diffstat (limited to 'source/blender/compositor/nodes/COM_ScaleNode.cpp')
| -rw-r--r-- | source/blender/compositor/nodes/COM_ScaleNode.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/compositor/nodes/COM_ScaleNode.cpp b/source/blender/compositor/nodes/COM_ScaleNode.cpp index 85d5644484b..870ed8f2484 100644 --- a/source/blender/compositor/nodes/COM_ScaleNode.cpp +++ b/source/blender/compositor/nodes/COM_ScaleNode.cpp @@ -65,8 +65,12 @@ void ScaleNode::convertToOperations(ExecutionSystem *graph, CompositorContext *c case CMP_SCALE_RENDERPERCENT: { const RenderData *data = &context->getScene()->r; ScaleFixedSizeOperation *operation = new ScaleFixedSizeOperation(); + + /* framing options */ operation->setIsAspect((bnode->custom2 & CMP_SCALE_RENDERSIZE_FRAME_ASPECT) != 0); operation->setIsCrop((bnode->custom2 & CMP_SCALE_RENDERSIZE_FRAME_CROP) != 0); + operation->setOffset(bnode->custom3, bnode->custom4); + operation->setNewWidth(data->xsch * data->size / 100.0f); operation->setNewHeight(data->ysch * data->size / 100.0f); inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph); |