[Bf-blender-cvs] [aeb5f21d209] soc-2019-cycles-procedural: Allow unavailable sockets to be taged as "in use".

OmarSquircleArt noreply at git.blender.org
Sat Aug 3 22:15:19 CEST 2019


Commit: aeb5f21d20915215711352a3422f4cb8485bd456
Author: OmarSquircleArt
Date:   Sat Aug 3 22:15:58 2019 +0200
Branches: soc-2019-cycles-procedural
https://developer.blender.org/rBaeb5f21d20915215711352a3422f4cb8485bd456

Allow unavailable sockets to be taged as "in use".

Unavailable sockets can and may still be linked, not tagging them as "in use" implies that they aren't linked, which is not true. This causes problems when the developer use the SOCK_IN_USE flag as an indication of the linking status of a socket. An example for this would be versioning code.

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

M	source/blender/blenkernel/intern/node.c

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

diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index 9bd2160b512..ce54015da8f 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -3232,11 +3232,6 @@ void ntreeTagUsedSockets(bNodeTree *ntree)
   }
 
   for (link = ntree->links.first; link; link = link->next) {
-    /* link is unused if either side is disabled */
-    if ((link->fromsock->flag & SOCK_UNAVAIL) || (link->tosock->flag & SOCK_UNAVAIL)) {
-      continue;
-    }
-
     link->fromsock->flag |= SOCK_IN_USE;
     link->tosock->flag |= SOCK_IN_USE;
   }



More information about the Bf-blender-cvs mailing list