Merge branch '28' into custom-manipulatorscustom-manipulators

1 files changed, 8 insertions, 5 deletions

diff --git a/release/scripts/startup/bl_ui/properties_world.py b/release/scripts/startup/bl_ui/properties_world.py
index fc5835d23d0..6e06d0593ff 100644
--- a/release/scripts/startup/bl_ui/properties_world.py
+++ b/release/scripts/startup/bl_ui/properties_world.py
@@ -270,13 +270,16 @@ class EEVEE_WORLD_PT_surface(WorldButtonsPanel, Panel):
 
         if world.use_nodes:
             ntree = world.node_tree
-            node = find_output_node(ntree, 'OUTPUT_WORLD')
+            node = find_output_node(ntree, ('OUTPUT_WORLD',))
 
-            if not node:
-                layout.label(text="No output node")
-            else:
+            if node:
                 input = find_node_input(node, 'Surface')
-                layout.template_node_view(ntree, node, input)
+                if input:
+                    layout.template_node_view(ntree, node, input)
+                else:
+                    layout.label(text="Incompatible output node")
+            else:
+                layout.label(text="No output node")
         else:
             layout.prop(world, "horizon_color", text="Color")