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.

1 files changed, 8 insertions, 1 deletions

diff --git a/source/blender/compositor/operations/COM_SocketProxyOperation.h b/source/blender/compositor/operations/COM_SocketProxyOperation.h
index 9733a1fbeec..c9d6cb6ef9e 100644
--- a/source/blender/compositor/operations/COM_SocketProxyOperation.h
+++ b/source/blender/compositor/operations/COM_SocketProxyOperation.h
@@ -27,9 +27,16 @@
 
 class SocketProxyOperation : public NodeOperation {
 public:
-	SocketProxyOperation(DataType type);
+	SocketProxyOperation(DataType type, bool use_conversion);
 	
 	bool isProxyOperation() const { return true; }
+	bool useDatatypeConversion() const { return m_use_conversion; }
+	
+	bool getUseConversion() const { return m_use_conversion; }
+	void setUseConversion(bool use_conversion) { m_use_conversion = use_conversion; }
+	
+private:
+	bool m_use_conversion;
 };
 
 #endif