Blender Git Loki

Git Commits -> Revision 1c3b332

Revision 1c3b332 by Lukas Toenne (master)
March 20, 2013, 13:17 (GMT)
Fix for #34708 and #34709, cycles group nodes were not working well with 0 or 2+ group input/output nodes.

The issue here was that the proxy nodes created for connecting extern group node sockets to the internal nodes were generated by the input/output nodes themselves.

0 input/output nodes: there would be no proxy that external group node sockets can map to
2+ input/output nodes: additional nodes would overwrite entries from previous nodes, so that only one of the input/output nodes would be used.

Solution is to always generate exactly 1 proxy node for every group socket in advance, regardless of whether it is used internally. Internal node sockets can then all map to this proxy node.

In the case out output nodes there should only ever be one active node, otherwise the connection to the proxy would be ambiguous. For this purpose the NODE_DO_OUTPUT flag has been exposed to RNA, so that cycles can check it and only use the active output.

Commit Details:

Full Hash: 1c3b3321e70ed95046705677bca329a929288ddd
SVN Revision: 55440
Parent Commit: 0130d7d
Lines Changed: +42, -40

2 Modified Paths:

/intern/cycles/blender/blender_shader.cpp (+37, -40) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+5, -0) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021