archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

remove scene from new compositor classes. only needs RenderData

Browse Source
This commit is contained in:
Campbell Barton
2012-06-22 15:06:52 +00:00
parent 590f5fdbdf
commit 0b0ac3aa9e
21 changed files with 68 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/compositor/nodes/COM_ScaleNode.cpp
View File

@@ -52,7 +52,7 @@ void ScaleNode::convertToOperations(ExecutionSystem *graph, CompositorContext *c
break;
case CMP_SCALE_SCENEPERCENT: {
SetValueOperation *scaleFactorOperation = new SetValueOperation();
scaleFactorOperation->setValue(context->getScene()->r.size / 100.0f);
scaleFactorOperation->setValue(context->getRenderData()->size / 100.0f);
ScaleOperation *operation = new ScaleOperation();
inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph);
addLink(graph, scaleFactorOperation->getOutputSocket(), operation->getInputSocket(1));
@@ -64,7 +64,7 @@ void ScaleNode::convertToOperations(ExecutionSystem *graph, CompositorContext *c
break;
case CMP_SCALE_RENDERPERCENT: {
const RenderData *data = &context->getScene()->r;
const RenderData *data = context->getRenderData();
ScaleFixedSizeOperation *operation = new ScaleFixedSizeOperation();
/* framing options */