archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix [#20749] Mute doesnt refresh the compositor

Browse Source
This commit is contained in:
Matt Ebb
2010-01-21 01:42:28 +00:00
parent 6d06f54fbe
commit e74bc901d3
5 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/space_node/drawnode.c
View File

@@ -937,8 +937,6 @@ static void node_composit_buts_colorbalance(uiLayout *layout, bContext *C, Point
static void node_composit_buts_huecorrect(uiLayout *layout, bContext *C, PointerRNA *ptr) static void node_composit_buts_huecorrect(uiLayout *layout, bContext *C, PointerRNA *ptr)
{ {
bNode *node= ptr->data;
uiTemplateCurveMapping(layout, ptr, "mapping", 'h', 0, 0); uiTemplateCurveMapping(layout, ptr, "mapping", 'h', 0, 0);
} }

2
source/blender/editors/space_node/node_draw.c
View File

@@ -115,7 +115,7 @@ void ED_node_changed_update(ID *id, bNode *node)
//addqueue(curarea->win, UI_BUT_EVENT, B_NODE_TREE_EXEC); //addqueue(curarea->win, UI_BUT_EVENT, B_NODE_TREE_EXEC);
//composite_node_render(snode, node); //composite_node_render(snode, node);
//snode_handle_recalc(snode); //snode_notify(snode);
/* add another event, a render can go fullscreen and open new window */ /* add another event, a render can go fullscreen and open new window */
//addqueue(curarea->win, UI_BUT_EVENT, B_NODE_TREE_EXEC); //addqueue(curarea->win, UI_BUT_EVENT, B_NODE_TREE_EXEC);

23
source/blender/editors/space_node/node_edit.c
View File

@@ -212,7 +212,7 @@ bNode *editnode_get_active(bNodeTree *ntree)
return nodeGetActive(ntree); return nodeGetActive(ntree);
} }
void snode_handle_recalc(bContext *C, SpaceNode *snode) void snode_notify(bContext *C, SpaceNode *snode)
{ {
if(snode->treetype==NTREE_SHADER) if(snode->treetype==NTREE_SHADER)
WM_event_add_notifier(C, NC_MATERIAL|ND_NODES, snode->id); WM_event_add_notifier(C, NC_MATERIAL|ND_NODES, snode->id);
@@ -1268,7 +1268,7 @@ static int node_duplicate_exec(bContext *C, wmOperator *op)
ntreeSolveOrder(snode->edittree); ntreeSolveOrder(snode->edittree);
node_tree_verify_groups(snode->nodetree); node_tree_verify_groups(snode->nodetree);
snode_handle_recalc(C, snode); snode_notify(C, snode);
return OPERATOR_FINISHED; return OPERATOR_FINISHED;
} }
@@ -1407,7 +1407,7 @@ static int node_link_modal(bContext *C, wmOperator *op, wmEvent *event)
ntreeSolveOrder(snode->edittree); ntreeSolveOrder(snode->edittree);
node_tree_verify_groups(snode->nodetree); node_tree_verify_groups(snode->nodetree);
snode_handle_recalc(C, snode); snode_notify(C, snode);
MEM_freeN(op->customdata); MEM_freeN(op->customdata);
op->customdata= NULL; op->customdata= NULL;
@@ -1525,7 +1525,7 @@ static int node_make_link_exec(bContext *C, wmOperator *op)
snode_autoconnect(snode, 0, replace); snode_autoconnect(snode, 0, replace);
node_tree_verify_groups(snode->nodetree); node_tree_verify_groups(snode->nodetree);
snode_handle_recalc(C, snode); snode_notify(C, snode);
return OPERATOR_FINISHED; return OPERATOR_FINISHED;
} }
@@ -1597,7 +1597,7 @@ static int cut_links_exec(bContext *C, wmOperator *op)
ntreeSolveOrder(snode->edittree); ntreeSolveOrder(snode->edittree);
node_tree_verify_groups(snode->nodetree); node_tree_verify_groups(snode->nodetree);
snode_handle_recalc(C, snode); snode_notify(C, snode);
return OPERATOR_FINISHED; return OPERATOR_FINISHED;
} }
@@ -1652,7 +1652,7 @@ void node_read_renderlayers(SpaceNode *snode)
} }
} }
// XXX snode_handle_recalc(snode); // XXX snode_notify(snode);
} }
void node_read_fullsamplelayers(SpaceNode *snode) void node_read_fullsamplelayers(SpaceNode *snode)
@@ -1733,7 +1733,7 @@ static int node_group_make_exec(bContext *C, wmOperator *op)
ntreeSolveOrder(snode->nodetree); ntreeSolveOrder(snode->nodetree);
} }
snode_handle_recalc(C, snode); snode_notify(C, snode);
return OPERATOR_FINISHED; return OPERATOR_FINISHED;
} }
@@ -1782,7 +1782,7 @@ static int node_hide_exec(bContext *C, wmOperator *op)
} }
} }
snode_handle_recalc(C, snode); snode_notify(C, snode);
return OPERATOR_FINISHED; return OPERATOR_FINISHED;
} }
@@ -1817,11 +1817,12 @@ static int node_mute_exec(bContext *C, wmOperator *op)
if(node->flag & SELECT) { if(node->flag & SELECT) {
if(node->inputs.first && node->outputs.first) { if(node->inputs.first && node->outputs.first) {
node->flag ^= NODE_MUTED; node->flag ^= NODE_MUTED;
NodeTagChanged(snode->edittree, node);
} }
} }
} }
snode_handle_recalc(C, snode); snode_notify(C, snode);
return OPERATOR_FINISHED; return OPERATOR_FINISHED;
} }
@@ -1860,7 +1861,7 @@ static int node_delete_exec(bContext *C, wmOperator *op)
node_tree_verify_groups(snode->nodetree); node_tree_verify_groups(snode->nodetree);
snode_handle_recalc(C, snode); snode_notify(C, snode);
return OPERATOR_FINISHED; return OPERATOR_FINISHED;
} }
@@ -1888,7 +1889,7 @@ static int node_show_cycles_exec(bContext *C, wmOperator *op)
/* this is just a wrapper around this call... */ /* this is just a wrapper around this call... */
ntreeSolveOrder(snode->edittree); ntreeSolveOrder(snode->edittree);
snode_handle_recalc(C, snode); snode_notify(C, snode);
return OPERATOR_FINISHED; return OPERATOR_FINISHED;
} }

2
source/blender/editors/space_node/node_header.c
View File

@@ -90,7 +90,7 @@ static void do_node_add(bContext *C, void *arg, int event)
if(node->flag & NODE_TEST) node->flag &= ~NODE_SELECT; 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) static void node_auto_add_menu(bContext *C, uiLayout *layout, void *arg_nodeclass)

2
source/blender/editors/space_node/node_intern.h
View File

@@ -73,7 +73,7 @@ void node_buts_group(struct uiLayout *layout, struct bContext *C, struct Pointer
/* node_edit.c */ /* node_edit.c */
void node_tree_from_ID(ID *id, bNodeTree **ntree, bNodeTree **edittree, int *treetype); 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 *next_node(bNodeTree *ntree);
bNode *node_add_node(SpaceNode *snode, Scene *scene, int type, float locx, float locy); bNode *node_add_node(SpaceNode *snode, Scene *scene, int type, float locx, float locy);
void snode_set_context(SpaceNode *snode, Scene *scene); void snode_set_context(SpaceNode *snode, Scene *scene);