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:
authorCampbell Barton <ideasman42@gmail.com>2012-06-14 22:55:35 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-06-14 22:55:35 +0400
commit91d0ef0a7eaa74df92f1e30299ba0e1720658eb6 (patch)
treee02f148bc019478af26f71a759fd818b3d56604c /source/blender/compositor/nodes/COM_ScaleNode.cpp
parent2cc9ecad553f1154a72efce9f73f9cac80797dfd (diff)
scale node for new compositor now supports framing option.
Diffstat (limited to 'source/blender/compositor/nodes/COM_ScaleNode.cpp')
-rw-r--r--source/blender/compositor/nodes/COM_ScaleNode.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/compositor/nodes/COM_ScaleNode.cpp b/source/blender/compositor/nodes/COM_ScaleNode.cpp
index 5b2d6851f9f..85d5644484b 100644
--- a/source/blender/compositor/nodes/COM_ScaleNode.cpp
+++ b/source/blender/compositor/nodes/COM_ScaleNode.cpp
@@ -65,6 +65,8 @@ void ScaleNode::convertToOperations(ExecutionSystem *graph, CompositorContext *c
case CMP_SCALE_RENDERPERCENT: {
const RenderData *data = &context->getScene()->r;
ScaleFixedSizeOperation *operation = new ScaleFixedSizeOperation();
+ operation->setIsAspect((bnode->custom2 & CMP_SCALE_RENDERSIZE_FRAME_ASPECT) != 0);
+ operation->setIsCrop((bnode->custom2 & CMP_SCALE_RENDERSIZE_FRAME_CROP) != 0);
operation->setNewWidth(data->xsch * data->size / 100.0f);
operation->setNewHeight(data->ysch * data->size / 100.0f);
inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph);