Automatically hide unused (=unlinked) node sockets in collapsed ("hidden") nodes...

The hiding code uses the SOCK_IN_USE flags already present. These were only temporarily set by the shader node code for determining needed texture coordinate types. Now they are used persistently and updated along with the sock->link pointers.

diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 378e587279171de76f6b4f98e2062ad3c4692798..6234308048b8531dbb67bb8dce7099cddb85a186 100644 (file)
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -305,8 +305,6 @@ void                        ntreeSwitchID(struct bNodeTree *ntree, struct ID *sce_from, struct ID *sc
 void                   ntreeMakeLocal(struct bNodeTree *ntree);
 int                            ntreeHasType(struct bNodeTree *ntree, int type);
 
-void                   ntreeSocketUseFlags(struct bNodeTree *ntree);
-
 void                   ntreeUpdateTree(struct bNodeTree *ntree);
 /* XXX Currently each tree update call does call to ntreeVerifyNodes too.
  * Some day this should be replaced by a decent depsgraph automatism!

diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index cc49e8465b9e6c796efe5d7e5c8a868c993d63c1..ce1dd429794851dae564b88fae9227a59b737a98 100644 (file)
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -1325,32 +1325,6 @@ void nodeSetActive(bNodeTree *ntree, bNode *node)
                node->flag |= NODE_ACTIVE_TEXTURE;
 }
 
-/* use flags are not persistent yet, groups might need different tagging, so we do it each time
-   when we need to get this info */
-void ntreeSocketUseFlags(bNodeTree *ntree)
-{
-       bNode *node;
-       bNodeSocket *sock;
-       bNodeLink *link;
-       
-       /* clear flags */
-       for(node= ntree->nodes.first; node; node= node->next) {
-               for(sock= node->inputs.first; sock; sock= sock->next)
-                       sock->flag &= ~SOCK_IN_USE;
-               for(sock= node->outputs.first; sock; sock= sock->next)
-                       sock->flag &= ~SOCK_IN_USE;
-       }
-       
-       /* tag all thats in use */
-       for(link= ntree->links.first; link; link= link->next) {
-       
-               if(link->fromsock) // FIXME, see below
-                       link->fromsock->flag |= SOCK_IN_USE;
-               if(link->tosock) // FIXME This can be NULL, when dragging a new link in the UI, should probably copy the node tree for preview render - campbell
-                       link->tosock->flag |= SOCK_IN_USE;
-       }
-}
-
 /* ************** dependency stuff *********** */
 
 /* node is guaranteed to be not checked before */
@@ -1425,16 +1399,27 @@ static void ntree_update_link_pointers(bNodeTree *ntree)
        
        /* first clear data */
        for(node= ntree->nodes.first; node; node= node->next) {
-               for(sock= node->inputs.first; sock; sock= sock->next)
+               for(sock= node->inputs.first; sock; sock= sock->next) {
                        sock->link= NULL;
+                       sock->flag &= ~SOCK_IN_USE;
+               }
+               for(sock= node->outputs.first; sock; sock= sock->next) {
+                       sock->flag &= ~SOCK_IN_USE;
+               }
+       }
+       for(sock= ntree->inputs.first; sock; sock= sock->next) {
+               sock->flag &= ~SOCK_IN_USE;
        }
-       /* clear socket links */
-       for(sock= ntree->outputs.first; sock; sock= sock->next)
+       for(sock= ntree->outputs.first; sock; sock= sock->next) {
                sock->link= NULL;
+               sock->flag &= ~SOCK_IN_USE;
+       }
 
        for(link= ntree->links.first; link; link= link->next) {
-               if (link->tosock)
-                       link->tosock->link= link;
+               link->tosock->link= link;
+               
+               link->fromsock->flag |= SOCK_IN_USE;
+               link->tosock->flag |= SOCK_IN_USE;
        }
 }
 

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 36df6f76601a93c6be23d66857f66563198884bb..0feb56b931ffb9375a33c966c8354f4681d1f0a9 100644 (file)
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7438,6 +7438,30 @@ void do_versions_image_settings_2_60(Scene *sce)
 
 }
 
+/* socket use flags were only temporary before */
+static void do_versions_nodetree_socket_use_flags_2_62(bNodeTree *ntree)
+{
+       bNode *node;
+       bNodeSocket *sock;
+       bNodeLink *link;
+       
+       for (node=ntree->nodes.first; node; node=node->next) {
+               for (sock=node->inputs.first; sock; sock=sock->next)
+                       sock->flag &= ~SOCK_IN_USE;
+               for (sock=node->outputs.first; sock; sock=sock->next)
+                       sock->flag &= ~SOCK_IN_USE;
+       }
+       for (sock=ntree->inputs.first; sock; sock=sock->next)
+               sock->flag &= ~SOCK_IN_USE;
+       for (sock=ntree->outputs.first; sock; sock=sock->next)
+               sock->flag &= ~SOCK_IN_USE;
+       
+       for (link=ntree->links.first; link; link=link->next) {
+               link->fromsock->flag |= SOCK_IN_USE;
+               link->tosock->flag |= SOCK_IN_USE;
+       }
+}
+
 static void do_versions(FileData *fd, Library *lib, Main *main)
 {
        /* WATCH IT!!!: pointers from libdata have not been converted */
@@ -12667,7 +12691,38 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 
        /* put compatibility code here until next subversion bump */
        {
-               /* nothing! */
+               {
+                       /* update use flags for node sockets (was only temporary before) */
+                       Scene *sce;
+                       Material *mat;
+                       Tex *tex;
+                       Lamp *lamp;
+                       World *world;
+                       bNodeTree *ntree;
+
+                       for (sce=main->scene.first; sce; sce=sce->id.next)
+                               if (sce->nodetree)
+                                       do_versions_nodetree_socket_use_flags_2_62(sce->nodetree);
+
+                       for (mat=main->mat.first; mat; mat=mat->id.next)
+                               if (mat->nodetree)
+                                       do_versions_nodetree_socket_use_flags_2_62(mat->nodetree);
+
+                       for (tex=main->tex.first; tex; tex=tex->id.next)
+                               if (tex->nodetree)
+                                       do_versions_nodetree_socket_use_flags_2_62(tex->nodetree);
+
+                       for (lamp=main->lamp.first; lamp; lamp=lamp->id.next)
+                               if (lamp->nodetree)
+                                       do_versions_nodetree_socket_use_flags_2_62(lamp->nodetree);
+
+                       for (world=main->world.first; world; world=world->id.next)
+                               if (world->nodetree)
+                                       do_versions_nodetree_socket_use_flags_2_62(world->nodetree);
+
+                       for (ntree=main->nodetree.first; ntree; ntree=ntree->id.next)
+                               do_versions_nodetree_socket_use_flags_2_62(ntree);
+               }
        }
 
        /* WATCH IT!!!: pointers from libdata have not been converted yet here! */

diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c
index 08e073494bb264a1d238b5360b44d5efbe392c64..7b692f55965c26db50cf7795ef55bc5b1fcefeb9 100644 (file)
--- a/source/blender/editors/space_node/node_draw.c
+++ b/source/blender/editors/space_node/node_draw.c
@@ -351,10 +351,10 @@ static void node_update_hidden(bNode *node)
 
        /* calculate minimal radius */
        for(nsock= node->inputs.first; nsock; nsock= nsock->next)
-               if(!(nsock->flag & (SOCK_HIDDEN|SOCK_UNAVAIL)))
+               if(!(nsock->flag & (SOCK_HIDDEN|SOCK_UNAVAIL)) && (nsock->flag & SOCK_IN_USE))
                        totin++;
        for(nsock= node->outputs.first; nsock; nsock= nsock->next)
-               if(!(nsock->flag & (SOCK_HIDDEN|SOCK_UNAVAIL)))
+               if(!(nsock->flag & (SOCK_HIDDEN|SOCK_UNAVAIL)) && (nsock->flag & SOCK_IN_USE))
                        totout++;
        
        tot= MAX2(totin, totout);
@@ -371,7 +371,7 @@ static void node_update_hidden(bNode *node)
        rad=drad= (float)M_PI/(1.0f + (float)totout);
        
        for(nsock= node->outputs.first; nsock; nsock= nsock->next) {
-               if(!(nsock->flag & (SOCK_HIDDEN|SOCK_UNAVAIL))) {
+               if(!(nsock->flag & (SOCK_HIDDEN|SOCK_UNAVAIL)) && (nsock->flag & SOCK_IN_USE)) {
                        nsock->locx= node->totr.xmax - hiddenrad + (float)sin(rad)*hiddenrad;
                        nsock->locy= node->totr.ymin + hiddenrad + (float)cos(rad)*hiddenrad;
                        rad+= drad;
@@ -382,7 +382,7 @@ static void node_update_hidden(bNode *node)
        rad=drad= - (float)M_PI/(1.0f + (float)totin);
        
        for(nsock= node->inputs.first; nsock; nsock= nsock->next) {
-               if(!(nsock->flag & (SOCK_HIDDEN|SOCK_UNAVAIL))) {
+               if(!(nsock->flag & (SOCK_HIDDEN|SOCK_UNAVAIL)) && (nsock->flag & SOCK_IN_USE)) {
                        nsock->locx= node->totr.xmin + hiddenrad + (float)sin(rad)*hiddenrad;
                        nsock->locy= node->totr.ymin + hiddenrad + (float)cos(rad)*hiddenrad;
                        rad+= drad;
@@ -854,12 +854,12 @@ static void node_draw_hidden(const bContext *C, ARegion *ar, SpaceNode *snode, b
        
        /* sockets */
        for(sock= node->inputs.first; sock; sock= sock->next) {
-               if(!(sock->flag & (SOCK_HIDDEN|SOCK_UNAVAIL)))
+               if(!(sock->flag & (SOCK_HIDDEN|SOCK_UNAVAIL)) && (sock->flag & SOCK_IN_USE))
                        node_socket_circle_draw(snode->nodetree, sock, socket_size);
        }
        
        for(sock= node->outputs.first; sock; sock= sock->next) {
-               if(!(sock->flag & (SOCK_HIDDEN|SOCK_UNAVAIL)))
+               if(!(sock->flag & (SOCK_HIDDEN|SOCK_UNAVAIL)) && (sock->flag & SOCK_IN_USE))
                        node_socket_circle_draw(snode->nodetree, sock, socket_size);
        }
        

diff --git a/source/blender/nodes/shader/node_shader_util.c b/source/blender/nodes/shader/node_shader_util.c
index 87585c35e6a4b2b09562aad5bb05a2dbcc2f3bb1..8b8afc3d846138124ef2f3673066e04929b29a3b 100644 (file)
--- a/source/blender/nodes/shader/node_shader_util.c
+++ b/source/blender/nodes/shader/node_shader_util.c
@@ -134,8 +134,6 @@ void ntreeShaderGetTexcoMode(bNodeTree *ntree, int r_mode, short *texco, int *mo
        bNodeSocket *sock;
        int a;
        
-       ntreeSocketUseFlags(ntree);
-
        for(node= ntree->nodes.first; node; node= node->next) {
                if(node->type==SH_NODE_TEXTURE) {
                        if((r_mode & R_OSA) && node->id) {