diff options
| author | OmarSquircleArt <omar.squircleart@gmail.com> | 2019-09-11 19:32:50 +0300 |
|---|---|---|
| committer | OmarSquircleArt <omar.squircleart@gmail.com> | 2019-09-11 19:32:50 +0300 |
| commit | 003802db83b561f9ff061811c6cde83356e5b277 (patch) | |
| tree | 1c7ac8268974fa2ef35c902b751a478e377f1ed3 /intern/cycles/blender/blender_shader.cpp | |
| parent | 6d85280ec3fb0c58b9a49f7da58d589483ad042c (diff) | |
Cycles: Ignore links with unavailable sockets.
Ignore links with unavailable/disabled sockets during shader graph
generation.
Diffstat (limited to 'intern/cycles/blender/blender_shader.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_shader.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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 */ |