[Bf-blender-cvs] [dd5d31b] master: Ignore "unavailable" links in the compositor, where one or both sockets are unavailable (hidden).
Lukas Tönne
noreply at git.blender.org
Wed Jan 14 11:15:58 CET 2015
Commit: dd5d31b515c12136959a97893a264e32066ab326
Author: Lukas Tönne
Date: Wed Jan 14 11:13:19 2015 +0100
Branches: master
https://developer.blender.org/rBdd5d31b515c12136959a97893a264e32066ab326
Ignore "unavailable" links in the compositor, where one or both sockets
are unavailable (hidden).
===================================================================
M source/blender/compositor/intern/COM_NodeGraph.cpp
===================================================================
diff --git a/source/blender/compositor/intern/COM_NodeGraph.cpp b/source/blender/compositor/intern/COM_NodeGraph.cpp
index 2dcf419..c5096a6 100644
--- a/source/blender/compositor/intern/COM_NodeGraph.cpp
+++ b/source/blender/compositor/intern/COM_NodeGraph.cpp
@@ -179,6 +179,8 @@ void NodeGraph::add_bNodeLink(const NodeRange &node_range, bNodeLink *b_nodelink
/// @note: ignore invalid links
if (!(b_nodelink->flag & NODE_LINK_VALID))
return;
+ if ((b_nodelink->fromsock->flag & SOCK_UNAVAIL) || (b_nodelink->tosock->flag & SOCK_UNAVAIL))
+ return;
/* Note: a DNA input socket can have multiple NodeInput in the compositor tree! (proxies)
* The output then gets linked to each one of them.
More information about the Bf-blender-cvs
mailing list