blender
/
blender
130
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

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.
This commit is contained in:
Bastien Montagne 2014-09-08 12:27:00 +02:00
parent 9c19ad1f79
commit 876ccc8373
Notes: blender-bot 2023-02-14 10:10:37 +01:00 
Referenced by issue #41573, Compositing reroute converts floats to red color
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
View File

@ -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())