diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-07-15 12:55:49 +0400 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2014-07-15 13:03:07 +0400 |
| commit | 2bdb872cfb90feae214088954d243820e4992c3b (patch) | |
| tree | 769a63c61ca7485531793ed6a101824d3c5fb26f /source/blender/compositor/intern/COM_NodeConverter.h | |
| parent | fa8ff63b48d2064701e1cc9929549c79c5dd73c3 (diff) | |
Fix T41067: Muted nodes still do data type conversions.
Proxy operations from muted nodes would still create conversion
operations where the datatypes don't match, which creates unexpected
behavior. Arguably datatype conversion could still happen even when the
main operation is muted, but this would be a design change and so is
disabled now.
Diffstat (limited to 'source/blender/compositor/intern/COM_NodeConverter.h')
| -rw-r--r-- | source/blender/compositor/intern/COM_NodeConverter.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/compositor/intern/COM_NodeConverter.h b/source/blender/compositor/intern/COM_NodeConverter.h index e5e7629f39a..414b4f1ee95 100644 --- a/source/blender/compositor/intern/COM_NodeConverter.h +++ b/source/blender/compositor/intern/COM_NodeConverter.h @@ -70,12 +70,12 @@ public: * This operation will be removed later and replaced * by direct links between the connected operations. */ - NodeOperationOutput *addInputProxy(NodeInput *input); + NodeOperationOutput *addInputProxy(NodeInput *input, bool use_conversion); /** Create a proxy operation for a node output. * This operation will be removed later and replaced * by direct links between the connected operations. */ - NodeOperationInput *addOutputProxy(NodeOutput *output); + NodeOperationInput *addOutputProxy(NodeOutput *output, bool use_conversion); /** Define a constant input value. */ void addInputValue(NodeOperationInput *input, float value); |