[Bf-blender-cvs] [228edc584a0] soc-2019-cycles-procedural: Ignore links with unavailable sockets during Cycles graph generation.
OmarSquircleArt
noreply at git.blender.org
Fri Aug 2 16:41:11 CEST 2019
Commit: 228edc584a002424a4fe4739c4feff4c7f638e7f
Author: OmarSquircleArt
Date: Fri Aug 2 16:41:53 2019 +0200
Branches: soc-2019-cycles-procedural
https://developer.blender.org/rB228edc584a002424a4fe4739c4feff4c7f638e7f
Ignore links with unavailable sockets during Cycles 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 5678f08af51..f7e50839437 100644
--- a/intern/cycles/blender/blender_shader.cpp
+++ b/intern/cycles/blender/blender_shader.cpp
@@ -1165,8 +1165,11 @@ 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 */
More information about the Bf-blender-cvs
mailing list