[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49529] trunk/blender/source/blender/ editors/space_node: DO not draw active outline for collapsed nodes when they're not selected

[Sergey Sharybin]

Revision: 49529
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49529
Author:   nazgul
Date:     2012-08-03 11:39:34 +0000 (Fri, 03 Aug 2012)
Log Message:
-----------
DO not draw active outline for collapsed nodes when they're not selected

Also made corrections to currently unused code

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

Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c	2012-08-03 11:13:38 UTC (rev 49528)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c	2012-08-03 11:39:34 UTC (rev 49529)
@@ -1135,7 +1135,7 @@
 	glDisable(GL_BLEND);
 
 	/* outline active and selected emphasis */
-	if (node->flag & (NODE_ACTIVE | SELECT)) {
+	if (node->flag & SELECT) {
 		glEnable(GL_BLEND);
 		glEnable(GL_LINE_SMOOTH);
 		/* using different shades of TH_TEXT_HI for the empasis, like triangle */

Modified: trunk/blender/source/blender/editors/space_node/node_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_draw.c	2012-08-03 11:13:38 UTC (rev 49528)
+++ trunk/blender/source/blender/editors/space_node/node_draw.c	2012-08-03 11:39:34 UTC (rev 49529)
@@ -881,7 +881,7 @@
 	uiRoundBox(rct->xmin, rct->ymin, rct->xmax, rct->ymax, hiddenrad);
 	
 	/* outline active and selected emphasis */
-	if (node->flag & (NODE_ACTIVE | SELECT)) {
+	if (node->flag & SELECT) {
 		glEnable(GL_BLEND);
 		glEnable(GL_LINE_SMOOTH);