diff options
author | Ton Roosendaal <ton@blender.org> | 2006-12-05 19:44:57 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2006-12-05 19:44:57 +0300 |
commit | 869eeadeff956f88f48a3b26ea69d0c2938233a3 (patch) | |
tree | 00f22b1f756cf45ad6769ce92b34b6fb2d95a1c0 /source/blender/src/editnode.c | |
parent | 3177c4f69fcb53c2aad744ee951ea60d98a77c86 (diff) |
Damn! Commit for render passes in wrong dir....
Diffstat (limited to 'source/blender/src/editnode.c')
-rw-r--r-- | source/blender/src/editnode.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/source/blender/src/editnode.c b/source/blender/src/editnode.c index 26196e16c9a..245a4a5339a 100644 --- a/source/blender/src/editnode.c +++ b/source/blender/src/editnode.c @@ -370,6 +370,8 @@ void node_composit_default(Scene *sce) nodeAddLink(sce->nodetree, in, fromsock, out, tosock); ntreeSolveOrder(sce->nodetree); /* needed for pointers */ + + ntreeCompositForceHidden(sce->nodetree); } /* Here we set the active tree(s), even called for each redraw now, so keep it fast :) */ @@ -395,6 +397,11 @@ void snode_set_context(SpaceNode *snode) else if(snode->treetype==NTREE_COMPOSIT) { snode->from= NULL; snode->id= &G.scene->id; + + /* bit clumsy but reliable way to see if we draw first time */ + if(snode->nodetree==NULL) + ntreeCompositForceHidden(G.scene->nodetree); + snode->nodetree= G.scene->nodetree; } @@ -816,7 +823,7 @@ static int find_indicated_socket(SpaceNode *snode, bNode **nodep, bNodeSocket ** for(node= snode->edittree->nodes.first; node; node= node->next) { if(in_out & SOCK_IN) { for(sock= node->inputs.first; sock; sock= sock->next) { - if(!(sock->flag & SOCK_HIDDEN)) { + if(!(sock->flag & (SOCK_HIDDEN|SOCK_UNAVAIL))) { if(BLI_in_rctf(&rect, sock->locx, sock->locy)) { if(node == visible_node(snode, &rect)) { *nodep= node; @@ -829,7 +836,7 @@ static int find_indicated_socket(SpaceNode *snode, bNode **nodep, bNodeSocket ** } if(in_out & SOCK_OUT) { for(sock= node->outputs.first; sock; sock= sock->next) { - if(!(sock->flag & SOCK_HIDDEN)) { + if(!(sock->flag & (SOCK_HIDDEN|SOCK_UNAVAIL))) { if(BLI_in_rctf(&rect, sock->locx, sock->locy)) { if(node == visible_node(snode, &rect)) { *nodep= node; @@ -1411,6 +1418,10 @@ bNode *node_add_node(SpaceNode *snode, int type, float locx, float locy) if(node->id) id_us_plus(node->id); + + if(snode->nodetree->type==NTREE_COMPOSIT) + ntreeCompositForceHidden(G.scene->nodetree); + } return node; } |