Commit: 876ccc8373f81c1f6f5dee1d44fc745c50861cbe
Author: Bastien Montagne
Date: Mon Sep 8 12:27:00 2014 +0200
Branches: master
https://developer.blender.org/rB876ccc8373f81c1f6f5dee1d44fc745c50861cbe
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.
===================================================================
M source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
===================================================================
diff --git a/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
b/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
index 0c8c3ed..fb5bc8f 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())
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
