[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41629] trunk/blender/source/blender: Nodes: add socket option to hide the default value in the UI, to be used for

[Brecht Van Lommel]

Revision: 41629
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41629
Author:   blendix
Date:     2011-11-07 17:30:52 +0000 (Mon, 07 Nov 2011)
Log Message:
-----------
Nodes: add socket option to hide the default value in the UI, to be used for
sockets that get their default value if no node is connected from elsewhere,
e.g. a texture coordinate.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_node.h
    trunk/blender/source/blender/editors/space_node/node_draw.c
    trunk/blender/source/blender/nodes/intern/node_socket.c
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_texture.c

Modified: trunk/blender/source/blender/blenkernel/BKE_node.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_node.h  2011-11-07 17:13:32 UTC 
(rev 41628)
+++ trunk/blender/source/blender/blenkernel/BKE_node.h  2011-11-07 17:30:52 UTC 
(rev 41629)
@@ -83,6 +83,7 @@
        float val1, val2, val3, val4;   /* default alloc value for inputs */
        float min, max;
        PropertySubType subtype;
+       int flag;
        
        /* after this line is used internal only */
        struct bNodeSocket *sock;               /* used to hold verified socket 
*/

Modified: trunk/blender/source/blender/editors/space_node/node_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_draw.c 2011-11-07 
17:13:32 UTC (rev 41628)
+++ trunk/blender/source/blender/editors/space_node/node_draw.c 2011-11-07 
17:30:52 UTC (rev 41629)
@@ -108,7 +108,8 @@
                        WM_main_add_notifier(NC_WORLD|ND_WORLD_DRAW, id);
        }
        else if(treetype==NTREE_COMPOSIT) {
-               nodeUpdate(edittree, node);
+               if(node)
+                       nodeUpdate(edittree, node);
                /* don't use NodeTagIDChanged, it gives far too many 
recomposites for image, scene layers, ... */
                        
                node= node_tree_get_editgroup(nodetree);
@@ -691,7 +692,7 @@
                
                node_socket_circle_draw(ntree, sock, NODE_SOCKSIZE);
                
-               if (sock->link) {
+               if (sock->link || (sock->flag & SOCK_HIDE_VALUE)) {
                        uiDefBut(node->block, LABEL, 0, sock->name, 
sock->locx+NODE_DYS, sock->locy-NODE_DYS, node->width-NODE_DY, NODE_DY,
                                         NULL, 0, 0, 0, 0, "");
                }

Modified: trunk/blender/source/blender/nodes/intern/node_socket.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/node_socket.c     2011-11-07 
17:13:32 UTC (rev 41628)
+++ trunk/blender/source/blender/nodes/intern/node_socket.c     2011-11-07 
17:30:52 UTC (rev 41629)
@@ -305,6 +305,7 @@
        default:
                sock = nodeAddSocket(ntree, node, SOCK_IN, stemp->name, 
stemp->type);
        }
+       sock->flag |= stemp->flag;
        return sock;
 }
 
@@ -351,6 +352,7 @@
                sock->type= stemp->type;                /* in future, read this 
from tydefs! */
                if(stemp->limit==0) sock->limit= 0xFFF;
                else sock->limit= stemp->limit;
+               sock->flag |= stemp->flag;
                
                /* Copy the property range and subtype parameters in case the 
template changed.
                 * NOT copying the actual value here, only button behavior 
changes!

Modified: trunk/blender/source/blender/nodes/shader/nodes/node_shader_texture.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_texture.c       
2011-11-07 17:13:32 UTC (rev 41628)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_texture.c       
2011-11-07 17:30:52 UTC (rev 41629)
@@ -36,7 +36,7 @@
 
 /* **************** TEXTURE ******************** */
 static bNodeSocketTemplate sh_node_texture_in[]= {
-       {       SOCK_VECTOR, 1, "Vector",       0.0f, 0.0f, 0.0f, 1.0f, -1.0f, 
1.0f, PROP_NONE},        /* no limit */
+       {       SOCK_VECTOR, 1, "Vector",       0.0f, 0.0f, 0.0f, 1.0f, -1.0f, 
1.0f, PROP_NONE, SOCK_HIDE_VALUE},       /* no limit */
        {       -1, 0, ""       }
 };
 static bNodeSocketTemplate sh_node_texture_out[]= {

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs