diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-06-14 19:04:40 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-14 19:04:40 +0400 |
| commit | 0b2fcf43680eb0c6877bd111580fa98ae7ccb7e7 (patch) | |
| tree | a7e8128cd82b18df3ca0dcda5a458dc2e1cfaa02 /source/blender/compositor/nodes/COM_ScaleNode.cpp | |
| parent | 91eed57e62f2c820a9d1b4764ff3d4c7adafd51c (diff) | |
change to scale node - multiply scale by scene size, without this theres no reliable way to match different scaled footage to an output and still have useful preview's at <100 percentage.
Diffstat (limited to 'source/blender/compositor/nodes/COM_ScaleNode.cpp')
| -rw-r--r-- | source/blender/compositor/nodes/COM_ScaleNode.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/compositor/nodes/COM_ScaleNode.cpp b/source/blender/compositor/nodes/COM_ScaleNode.cpp index fd4e4331fca..09fd40be31e 100644 --- a/source/blender/compositor/nodes/COM_ScaleNode.cpp +++ b/source/blender/compositor/nodes/COM_ScaleNode.cpp @@ -77,6 +77,11 @@ void ScaleNode::convertToOperations(ExecutionSystem *graph, CompositorContext *c case CMP_SCALE_ABSOLUTE: { ScaleAbsoluteOperation *operation = new ScaleAbsoluteOperation(); // TODO: what is the use of this one.... perhaps some issues when the ui was updated.... +#ifdef USE_SCENE_COMPO_SCALE + const RenderData *data = &context->getScene()->r; + operation->setRenderPercentage(data->size / 100.0f); +#endif + inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph); inputXSocket->relinkConnections(operation->getInputSocket(1), 1, graph); inputYSocket->relinkConnections(operation->getInputSocket(2), 2, graph); |