From 26727aeb2ded300f7b56a11c5a1d33cfc4a3ee0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Devernay?= Date: Tue, 15 Nov 2016 18:27:41 +0100 Subject: [PATCH] Merge: input B is optional again, useful for the "copy" operator with a mask copy with mask is used eg in edgeblur --- Merge/Merge.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Merge/Merge.cpp b/Merge/Merge.cpp index f74567447..21e9916f1 100644 --- a/Merge/Merge.cpp +++ b/Merge/Merge.cpp @@ -48,7 +48,7 @@ OFXS_NAMESPACE_ANONYMOUS_ENTER #define kPluginGrouping "Merge" #define kPluginDescriptionStart \ "Pixel-by-pixel merge operation between two or more inputs.\n" \ - "Input A is first merged with B (B is non-optional), then A2, if connected, is merged with the intermediary result, then A3, etc.\n\n" \ + "Input A is first merged with B (or with a black and transparent background if B is not connected), then A2, if connected, is merged with the intermediary result, then A3, etc.\n\n" \ "A complete explanation of the Porter-Duff compositing operators can be found in \"Compositing Digital Images\", by T. Porter and T. Duff (Proc. SIGGRAPH 1984) http://keithp.com/~keithp/porterduff/p253-porter.pdf\n" \ "\n" #define kPluginDescriptionMidRGB \ @@ -1240,7 +1240,7 @@ MergePluginFactory::describeInContext(OFX::ImageEffectDescriptor &desc, //Optional: If we want a render to be triggered even if one of the inputs is not connected //they need to be optional. - srcClipB->setOptional(false); // B clip is non-optional + srcClipB->setOptional(true); // B clip is optional OFX::ClipDescriptor* srcClipA = desc.defineClip(kClipA); srcClipA->setHint(kClipAHint);