[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26156] trunk/blender/source/blender/ editors/space_node: Fix [#20749] Mute doesnt refresh the compositor

[Matt Ebb]

Revision: 26156
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26156
Author:   broken
Date:     2010-01-21 02:42:28 +0100 (Thu, 21 Jan 2010)

Log Message:
-----------
Fix [#20749] Mute doesnt refresh the compositor

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_node/drawnode.c
    trunk/blender/source/blender/editors/space_node/node_draw.c
    trunk/blender/source/blender/editors/space_node/node_edit.c
    trunk/blender/source/blender/editors/space_node/node_header.c
    trunk/blender/source/blender/editors/space_node/node_intern.h

Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c	2010-01-21 01:30:32 UTC (rev 26155)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c	2010-01-21 01:42:28 UTC (rev 26156)
@@ -937,8 +937,6 @@
 
 static void node_composit_buts_huecorrect(uiLayout *layout, bContext *C, PointerRNA *ptr)
 {
-	bNode *node= ptr->data;
-
 	uiTemplateCurveMapping(layout, ptr, "mapping", 'h', 0, 0);
 }
 

Modified: trunk/blender/source/blender/editors/space_node/node_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_draw.c	2010-01-21 01:30:32 UTC (rev 26155)
+++ trunk/blender/source/blender/editors/space_node/node_draw.c	2010-01-21 01:42:28 UTC (rev 26156)
@@ -115,7 +115,7 @@
 			//addqueue(curarea->win, UI_BUT_EVENT, B_NODE_TREE_EXEC);
 			
 			//composite_node_render(snode, node);
-			//snode_handle_recalc(snode);
+			//snode_notify(snode);
 			
 			/* add another event, a render can go fullscreen and open new window */
 			//addqueue(curarea->win, UI_BUT_EVENT, B_NODE_TREE_EXEC);

Modified: trunk/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_edit.c	2010-01-21 01:30:32 UTC (rev 26155)
+++ trunk/blender/source/blender/editors/space_node/node_edit.c	2010-01-21 01:42:28 UTC (rev 26156)
@@ -212,7 +212,7 @@
 		return nodeGetActive(ntree);
 }
 
-void snode_handle_recalc(bContext *C, SpaceNode *snode)
+void snode_notify(bContext *C, SpaceNode *snode)
 {
 	if(snode->treetype==NTREE_SHADER)
 		WM_event_add_notifier(C, NC_MATERIAL|ND_NODES, snode->id);
@@ -1268,7 +1268,7 @@
 	
 	ntreeSolveOrder(snode->edittree);
 	node_tree_verify_groups(snode->nodetree);
-	snode_handle_recalc(C, snode);
+	snode_notify(C, snode);
 
 	return OPERATOR_FINISHED;
 }
@@ -1407,7 +1407,7 @@
 			
 			ntreeSolveOrder(snode->edittree);
 			node_tree_verify_groups(snode->nodetree);
-			snode_handle_recalc(C, snode);
+			snode_notify(C, snode);
 			
 			MEM_freeN(op->customdata);
 			op->customdata= NULL;
@@ -1525,7 +1525,7 @@
 	snode_autoconnect(snode, 0, replace);
 
 	node_tree_verify_groups(snode->nodetree);
-	snode_handle_recalc(C, snode);
+	snode_notify(C, snode);
 	
 	return OPERATOR_FINISHED;
 }
@@ -1597,7 +1597,7 @@
 		
 		ntreeSolveOrder(snode->edittree);
 		node_tree_verify_groups(snode->nodetree);
-		snode_handle_recalc(C, snode);
+		snode_notify(C, snode);
 		
 		return OPERATOR_FINISHED;
 	}
@@ -1652,7 +1652,7 @@
 		}
 	}
 	
-	// XXX			snode_handle_recalc(snode);
+	// XXX			snode_notify(snode);
 }
 
 void node_read_fullsamplelayers(SpaceNode *snode)
@@ -1733,7 +1733,7 @@
 		ntreeSolveOrder(snode->nodetree);
 	}
 	
-	snode_handle_recalc(C, snode);
+	snode_notify(C, snode);
 	
 	return OPERATOR_FINISHED;
 }
@@ -1782,7 +1782,7 @@
 		}
 	}
 	
-	snode_handle_recalc(C, snode);
+	snode_notify(C, snode);
 	
 	return OPERATOR_FINISHED;
 }
@@ -1817,11 +1817,12 @@
 		if(node->flag & SELECT) {
 			if(node->inputs.first && node->outputs.first) {
 				node->flag ^= NODE_MUTED;
+				NodeTagChanged(snode->edittree, node);
 			}
 		}
 	}
 	
-	snode_handle_recalc(C, snode);
+	snode_notify(C, snode);
 	
 	return OPERATOR_FINISHED;
 }
@@ -1860,7 +1861,7 @@
 	
 	node_tree_verify_groups(snode->nodetree);
 
-	snode_handle_recalc(C, snode);
+	snode_notify(C, snode);
 	
 	return OPERATOR_FINISHED;
 }
@@ -1888,7 +1889,7 @@
 	
 	/* this is just a wrapper around this call... */
 	ntreeSolveOrder(snode->edittree);
-	snode_handle_recalc(C, snode);
+	snode_notify(C, snode);
 	
 	return OPERATOR_FINISHED;
 }

Modified: trunk/blender/source/blender/editors/space_node/node_header.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_header.c	2010-01-21 01:30:32 UTC (rev 26155)
+++ trunk/blender/source/blender/editors/space_node/node_header.c	2010-01-21 01:42:28 UTC (rev 26156)
@@ -90,7 +90,7 @@
 		if(node->flag & NODE_TEST) node->flag &= ~NODE_SELECT;
 	}
 		
-	snode_handle_recalc(C, snode);
+	snode_notify(C, snode);
 }
 
 static void node_auto_add_menu(bContext *C, uiLayout *layout, void *arg_nodeclass)

Modified: trunk/blender/source/blender/editors/space_node/node_intern.h
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_intern.h	2010-01-21 01:30:32 UTC (rev 26155)
+++ trunk/blender/source/blender/editors/space_node/node_intern.h	2010-01-21 01:42:28 UTC (rev 26156)
@@ -73,7 +73,7 @@
 
 /* node_edit.c */
 void node_tree_from_ID(ID *id, bNodeTree **ntree, bNodeTree **edittree, int *treetype);
-void snode_handle_recalc(bContext *C, SpaceNode *snode);
+void snode_notify(bContext *C, SpaceNode *snode);
 bNode *next_node(bNodeTree *ntree);
 bNode *node_add_node(SpaceNode *snode, Scene *scene, int type, float locx, float locy);
 void snode_set_context(SpaceNode *snode, Scene *scene);