diff options
author | Jeroen Bakker <j.bakker@atmind.nl> | 2012-05-22 13:54:08 +0400 |
---|---|---|
committer | Jeroen Bakker <j.bakker@atmind.nl> | 2012-05-22 13:54:08 +0400 |
commit | dbd70c05f799afb4d8a3584eae58af384ee14353 (patch) | |
tree | cd2edf5b6920cedc3d6311680509cffc9b165404 /source/blender/compositor/nodes | |
parent | e7647e15859f524c1989847656e4ea228507d71b (diff) |
* Composite result is updated when editing (preview were already
calculated, now the final result is also updated in the image space
* default texture size when not connected to any resolution depended
operation defaults to render size
Diffstat (limited to 'source/blender/compositor/nodes')
-rw-r--r-- | source/blender/compositor/nodes/COM_TextureNode.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/compositor/nodes/COM_TextureNode.cpp b/source/blender/compositor/nodes/COM_TextureNode.cpp index 0f9a2ca4c26..5e59d86e7d9 100644 --- a/source/blender/compositor/nodes/COM_TextureNode.cpp +++ b/source/blender/compositor/nodes/COM_TextureNode.cpp @@ -37,6 +37,7 @@ void TextureNode::convertToOperations(ExecutionSystem *system, CompositorContext this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), true, 0, system); this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), true, 1, system); operation->setTexture(texture); + operation->setScene(context->getScene()); system->addOperation(operation); addPreviewOperation(system, operation->getOutputSocket(), 9); @@ -46,6 +47,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()); system->addOperation(alphaOperation); } } |