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

@@ -38,7 +38,7 @@ void TextureNode::convertToOperations(ExecutionSystem *system, CompositorContext
this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, system);
this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, system);
operation->setTexture(texture);
operation->setScene(context->getScene());
operation->setRenderData(context->getRenderData());
system->addOperation(operation);
addPreviewOperation(system, operation->getOutputSocket());
@@ -48,7 +48,7 @@ void TextureNode::convertToOperations(ExecutionSystem *system, CompositorContext
addLink(system, operation->getInputSocket(0)->getConnection()->getFromSocket(), alphaOperation->getInputSocket(0));
addLink(system, operation->getInputSocket(1)->getConnection()->getFromSocket(), alphaOperation->getInputSocket(1));
alphaOperation->setTexture(texture);
alphaOperation->setScene(context->getScene());
alphaOperation->setRenderData(context->getRenderData());
system->addOperation(alphaOperation);
}
}