diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-09-08 14:27:00 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-09-08 14:28:51 +0400 |
| commit | 876ccc8373f81c1f6f5dee1d44fc745c50861cbe (patch) | |
| tree | 474dec7aa3ed788cef2243b86320311c12f00cc6 /source/blender/compositor/intern | |
| parent | 9c19ad1f79d0702ef128509232f9e8613076ffea (diff) | |
Fix T41573: Compositing reroute converts floats to red color
At compo level, only skip data type conversion if both ends of a link do not require it.
Thanks to Lukas for advices and review.
Diffstat (limited to 'source/blender/compositor/intern')
| -rw-r--r-- | source/blender/compositor/intern/COM_NodeOperationBuilder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp b/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp index 0c8c3ed53a7..fb5bc8fcd9b 100644 --- a/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp +++ b/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp @@ -273,7 +273,7 @@ void NodeOperationBuilder::add_datatype_conversions() /* proxy operations can skip data type conversion */ NodeOperation *from_op = &link.from()->getOperation(); NodeOperation *to_op = &link.to()->getOperation(); - if (!from_op->useDatatypeConversion() || !to_op->useDatatypeConversion()) + if (!(from_op->useDatatypeConversion() || to_op->useDatatypeConversion())) continue; if (link.from()->getDataType() != link.to()->getDataType()) |