Merging r38562 through r38614 from trunkinto soc-2011-tomato
[blender.git] / source / blender / editors / space_node / drawnode.c
index d4925e39407b6392c81901c752f9976596f0b4b8..f7986ac68f5b4eda06f2914973ad8bfb3eadb3c8 100644 (file)
@@ -1877,10 +1877,17 @@ void node_draw_link(View2D *v2d, SpaceNode *snode, bNodeLink *link)
                else {
                        /* check cyclic */
                        if(link->fromnode->level >= link->tonode->level && link->tonode->level!=0xFFF) {
-                               if(link->fromnode->flag & SELECT)
-                                       th_col1= TH_EDGE_SELECT;
-                               if(link->tonode->flag & SELECT)
-                                       th_col2= TH_EDGE_SELECT;
+                               /* special indicated link, on drop-node */
+                               if(link->flag & NODE_LINKFLAG_HILITE) {
+                                       th_col1= th_col2= TH_ACTIVE;
+                               }
+                               else {
+                                       /* regular link */
+                                       if(link->fromnode->flag & SELECT)
+                                               th_col1= TH_EDGE_SELECT;
+                                       if(link->tonode->flag & SELECT)
+                                               th_col2= TH_EDGE_SELECT;
+                               }
                                do_shaded= 1;
                                do_triple= 1;
                        }