[Bf-blender-cvs] [003802db83b] master: Cycles: Ignore links with unavailable sockets.

[OmarSquircleArt]

Commit: 003802db83b561f9ff061811c6cde83356e5b277
Author: OmarSquircleArt
Date:   Wed Sep 11 18:32:50 2019 +0200
Branches: master
https://developer.blender.org/rB003802db83b561f9ff061811c6cde83356e5b277

Cycles: Ignore links with unavailable sockets.

Ignore links with unavailable/disabled sockets during shader graph
generation.

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

M	intern/cycles/blender/blender_shader.cpp

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

diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp
index 7e784527a21..db01167cc2a 100644
--- a/intern/cycles/blender/blender_shader.cpp
+++ b/intern/cycles/blender/blender_shader.cpp
@@ -1165,8 +1165,10 @@ static void add_nodes(Scene *scene,
   BL::NodeTree::links_iterator b_link;
 
   for (b_ntree.links.begin(b_link); b_link != b_ntree.links.end(); ++b_link) {
-    /* Ignore invalid links to avoid unwanted cycles created in graph. */
-    if (!b_link->is_valid()) {
+    /* Ignore invalid links to avoid unwanted cycles created in graph.
+     * Also ignore links with unavailable sockets. */
+    if (!(b_link->is_valid() && b_link->from_socket().enabled() &&
+          b_link->to_socket().enabled())) {
       continue;
     }
     /* get blender link data */