From 876ccc8373f81c1f6f5dee1d44fc745c50861cbe Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 8 Sep 2014 12:27:00 +0200 Subject: 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. --- source/blender/compositor/intern/COM_NodeOperationBuilder.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/compositor/intern') 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()) -- cgit v1.2.3