[Bf-blender-cvs] [32690cafd16] master: Fix: Missing compositor warning for Render Layers

Omar Emara noreply at git.blender.org
Fri Nov 25 12:00:07 CET 2022


Commit: 32690cafd164dad5d590c4268d575339fb81fa87
Author: Omar Emara
Date:   Fri Nov 25 12:57:16 2022 +0200
Branches: master
https://developer.blender.org/rB32690cafd164dad5d590c4268d575339fb81fa87

Fix: Missing compositor warning for Render Layers

The Render Layers node didn't draw a warning in the viewport when an
unsupported pass is used. This patch adds that warning.

===================================================================

M	source/blender/nodes/composite/nodes/node_composite_image.cc

===================================================================

diff --git a/source/blender/nodes/composite/nodes/node_composite_image.cc b/source/blender/nodes/composite/nodes/node_composite_image.cc
index c49c16941f1..9bfb150205b 100644
--- a/source/blender/nodes/composite/nodes/node_composite_image.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_image.cc
@@ -853,7 +853,11 @@ class RenderLayerOperation : public NodeOperation {
     /* Other output passes are not supported for now, so allocate them as invalid. */
     for (const bNodeSocket *output : this->node()->output_sockets()) {
       if (!STR_ELEM(output->identifier, "Image", "Alpha")) {
-        get_result(output->identifier).allocate_invalid();
+        Result &unsupported_result = get_result(output->identifier);
+        if (unsupported_result.should_compute()) {
+          unsupported_result.allocate_invalid();
+          context().set_info_message("Viewport compositor setup not fully supported");
+        }
       }
     }
   }



More information about the Bf-blender-cvs mailing list