[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46275] trunk/blender/source/blender/ editors/space_node/node_edit.c: Removed the automatic socket selection in the modal node linking operator.

[Lukas Toenne]

Revision: 46275
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46275
Author:   lukastoenne
Date:     2012-05-04 13:12:09 +0000 (Fri, 04 May 2012)
Log Message:
-----------
Removed the automatic socket selection in the modal node linking operator.

This was originally reimplemented as part of the socket selection feature, but since selecting a socket necessarily also selected the owning node, it messes with the manual user selection of nodes too much (and doesn't add any additional usability).

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_node/node_edit.c

Modified: trunk/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_edit.c	2012-05-04 13:07:11 UTC (rev 46274)
+++ trunk/blender/source/blender/editors/space_node/node_edit.c	2012-05-04 13:12:09 UTC (rev 46275)
@@ -2324,9 +2324,6 @@
 		case MOUSEMOVE:
 			
 			if (in_out==SOCK_OUT) {
-				/* only target socket becomes hilighted */
-				node_deselect_all_input_sockets(snode, 0);
-				
 				if (node_find_indicated_socket(snode, &tnode, &tsock, SOCK_IN)) {
 					if (nodeFindLink(snode->edittree, sock, tsock)==NULL) {
 						if ( link->tosock!= tsock && (!tnode || (tnode!=node && link->tonode!=tnode)) ) {
@@ -2340,9 +2337,6 @@
 							ntreeUpdateTree(snode->edittree);
 						}
 					}
-					
-					/* hilight target socket */
-					node_socket_select(tnode, tsock);
 				}
 				else {
 					if (link->tonode || link->tosock) {
@@ -2357,9 +2351,6 @@
 				}
 			}
 			else {
-				/* only target socket becomes hilighted */
-				node_deselect_all_output_sockets(snode, 0);
-				
 				if (node_find_indicated_socket(snode, &tnode, &tsock, SOCK_OUT)) {
 					if (nodeFindLink(snode->edittree, sock, tsock)==NULL) {
 						if (nodeCountSocketLinks(snode->edittree, tsock) < tsock->limit) {
@@ -2375,9 +2366,6 @@
 							}
 						}
 					}
-					
-					/* hilight target socket */
-					node_socket_select(tnode, tsock);
 				}
 				else {
 					if (link->tonode || link->tosock) {
@@ -2405,10 +2393,6 @@
 				if (in_out==SOCK_OUT)
 					node_remove_extra_links(snode, link->tosock, link);
 				
-				/* deselect sockets after successful linking */
-				node_deselect_all_input_sockets(snode, 0);
-				node_deselect_all_output_sockets(snode, 0);
-				
 				/* when linking to group outputs, update the socket type */
 				/* XXX this should all be part of a generic update system */
 				if (!link->tonode) {
@@ -2434,10 +2418,6 @@
 					}
 					snode->edittree->update |= NTREE_UPDATE_GROUP_OUT | NTREE_UPDATE_LINKS;
 				}
-				
-				/* deselect sockets after successful linking */
-				node_deselect_all_input_sockets(snode, 0);
-				node_deselect_all_output_sockets(snode, 0);
 			}
 			else
 				nodeRemLink(snode->edittree, link);
@@ -2478,10 +2458,6 @@
 				in_out = SOCK_IN;
 			}
 		}
-		
-		/* hilight source socket only */
-		node_deselect_all_output_sockets(snode, 0);
-		node_socket_select(nldrag->node, nldrag->sock);
 	}
 	/* or an input? */
 	else if (node_find_indicated_socket(snode, &nldrag->node, &nldrag->sock, SOCK_IN)) {
@@ -2504,10 +2480,6 @@
 				in_out = SOCK_OUT;
 			}
 		}
-		
-		/* hilight source socket only */
-		node_deselect_all_input_sockets(snode, 0);
-		node_socket_select(nldrag->node, nldrag->sock);
 	}
 	
 	return in_out;