[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51602] trunk/blender/source/blender: Cycles UI: keep node input sockets collapsed by default in the properties editor,

[Brecht Van Lommel]

Revision: 51602
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51602
Author:   blendix
Date:     2012-10-24 21:57:16 +0000 (Wed, 24 Oct 2012)
Log Message:
-----------
Cycles UI: keep node input sockets collapsed by default in the properties editor,
when doing the linking in the node editor, to keep the properties editor more
clean in this case.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/node.c
    trunk/blender/source/blender/editors/space_node/node_templates.c
    trunk/blender/source/blender/nodes/intern/node_common.c

Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c	2012-10-24 21:57:07 UTC (rev 51601)
+++ trunk/blender/source/blender/blenkernel/intern/node.c	2012-10-24 21:57:16 UTC (rev 51602)
@@ -147,6 +147,7 @@
 	sock->limit = (in_out == SOCK_IN ? 1 : 0xFFF);
 	sock->type = type;
 	sock->storage = NULL;
+	sock->flag |= SOCK_COLLAPSED;
 	
 	sock->default_value = node_socket_make_default_value(type);
 	node_socket_init_default_value(type, sock->default_value);

Modified: trunk/blender/source/blender/editors/space_node/node_templates.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_templates.c	2012-10-24 21:57:07 UTC (rev 51601)
+++ trunk/blender/source/blender/editors/space_node/node_templates.c	2012-10-24 21:57:16 UTC (rev 51602)
@@ -122,6 +122,7 @@
 		return;
 
 	nodeRemLink(ntree, sock_to->link);
+	sock_to->flag |= SOCK_COLLAPSED;
 
 	nodeUpdate(ntree, node_to);
 	ntreeUpdateTree(ntree);
@@ -136,6 +137,7 @@
 		return;
 
 	node_remove_linked(ntree, sock_to->link->fromnode);
+	sock_to->flag |= SOCK_COLLAPSED;
 
 	nodeUpdate(ntree, node_to);
 	ntreeUpdateTree(ntree);
@@ -185,6 +187,7 @@
 	/* add link */
 	sock_from_tmp = BLI_findlink(&node_from->outputs, sock_num);
 	nodeAddLink(ntree, node_from, sock_from_tmp, node_to, sock_to);
+	sock_to->flag &= ~SOCK_COLLAPSED;
 
 	/* copy input sockets from previous node */
 	if (node_prev && node_from != node_prev) {
@@ -613,7 +616,7 @@
 		/* input linked to a node */
 		uiTemplateNodeLink(split, ntree, node, input);
 
-		if (!(input->flag & SOCK_COLLAPSED)) {
+		if (depth == 0 || !(input->flag & SOCK_COLLAPSED)) {
 			if (depth == 0)
 				uiItemS(layout);
 

Modified: trunk/blender/source/blender/nodes/intern/node_common.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/node_common.c	2012-10-24 21:57:07 UTC (rev 51601)
+++ trunk/blender/source/blender/nodes/intern/node_common.c	2012-10-24 21:57:16 UTC (rev 51602)
@@ -92,7 +92,7 @@
 	sock->new_sock = NULL;
 	
 	/* group sockets are dynamically added */
-	sock->flag |= SOCK_DYNAMIC;
+	sock->flag |= SOCK_DYNAMIC|SOCK_COLLAPSED;
 	
 	sock->own_index = gsock->own_index;
 	sock->groupsock = gsock;
@@ -115,7 +115,7 @@
 	BLI_strncpy(gsock->name, name, sizeof(gsock->name));
 	gsock->type = type;
 	/* group sockets are dynamically added */
-	gsock->flag |= SOCK_DYNAMIC;
+	gsock->flag |= SOCK_DYNAMIC|SOCK_COLLAPSED;
 
 	gsock->next = gsock->prev = NULL;
 	gsock->new_sock = NULL;