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_OutputFileNode.cpp
View File

@@ -47,7 +47,7 @@ void OutputFileNode::convertToOperations(ExecutionSystem *graph, CompositorConte
if (storage->format.imtype == R_IMF_IMTYPE_MULTILAYER) {
/* single output operation for the multilayer file */
OutputOpenExrMultiLayerOperation *outputOperation = new OutputOpenExrMultiLayerOperation(
context->getScene(), context->getbNodeTree(), storage->base_path, storage->format.exr_codec);
context->getRenderData(), context->getbNodeTree(), storage->base_path, storage->format.exr_codec);
int num_inputs = getNumberOfInputSockets();
bool hasConnections = false;
@@ -80,7 +80,7 @@ void OutputFileNode::convertToOperations(ExecutionSystem *graph, CompositorConte
BLI_join_dirfile(path, FILE_MAX, storage->base_path, sockdata->path);
OutputSingleLayerOperation *outputOperation = new OutputSingleLayerOperation(
context->getScene(), context->getbNodeTree(), input->getDataType(), format, path);
context->getRenderData(), context->getbNodeTree(), input->getDataType(), format, path);
input->relinkConnections(outputOperation->getInputSocket(0));
graph->addOperation(outputOperation);
if (!previewAdded) {