[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49506] trunk/blender/source/blender/ editors/space_node/node_select.c: Node selection: make node active before it could be unselected by extending

[Sergey Sharybin]

Revision: 49506
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49506
Author:   nazgul
Date:     2012-08-02 16:01:05 +0000 (Thu, 02 Aug 2012)
Log Message:
-----------
Node selection: make node active before it could be unselected by extending
selection, which matches behavior of all other areas in blender.

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

Modified: trunk/blender/source/blender/editors/space_node/node_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_select.c	2012-08-02 15:49:20 UTC (rev 49505)
+++ trunk/blender/source/blender/editors/space_node/node_select.c	2012-08-02 16:01:05 UTC (rev 49506)
@@ -368,9 +368,17 @@
 			node = node_under_mouse_select(snode->edittree, mx, my);
 			
 			if (node) {
-				node_toggle(node);
-				
-				ED_node_set_active(bmain, snode->edittree, node);
+				if ((node->flag & SELECT) && (node->flag & NODE_ACTIVE) == 0) {
+					/* if node is selected but not active make it active
+					 * before it'll be desleected
+					 */
+					ED_node_set_active(bmain, snode->edittree, node);
+				}
+				else {
+					node_toggle(node);
+					ED_node_set_active(bmain, snode->edittree, node);
+				}
+
 				selected = 1;
 			}
 		}