diff options
author | Matt Ebb <matt@mke3.net> | 2010-01-21 04:42:28 +0300 |
---|---|---|
committer | Matt Ebb <matt@mke3.net> | 2010-01-21 04:42:28 +0300 |
commit | e74bc901d3b88fab7b4774bba7e1d97a29efe34c (patch) | |
tree | 86c99a7d32467d27dd174923f01c6ec2b6919760 | |
parent | 6d06f54fbe6a8ad674264cdebc93460fea528b77 (diff) |
Fix [#20749] Mute doesnt refresh the compositor
-rw-r--r-- | source/blender/editors/space_node/drawnode.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_draw.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_edit.c | 23 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_header.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_intern.h | 2 |
5 files changed, 15 insertions, 16 deletions
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index 95e7239b50e..3092aaba507 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -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) { - bNode *node= ptr->data; - uiTemplateCurveMapping(layout, ptr, "mapping", 'h', 0, 0); } diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index ad897e1dd6e..f6a2323b0f4 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -115,7 +115,7 @@ void ED_node_changed_update(ID *id, bNode *node) //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); diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index bd9c56bf8a0..aba262bf92b 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -212,7 +212,7 @@ bNode *editnode_get_active(bNodeTree *ntree) 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 @@ static int node_duplicate_exec(bContext *C, wmOperator *op) 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 @@ static int node_link_modal(bContext *C, wmOperator *op, wmEvent *event) 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 @@ static int node_make_link_exec(bContext *C, wmOperator *op) 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 @@ static int cut_links_exec(bContext *C, wmOperator *op) 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 @@ void node_read_renderlayers(SpaceNode *snode) } } - // XXX snode_handle_recalc(snode); + // XXX snode_notify(snode); } void node_read_fullsamplelayers(SpaceNode *snode) @@ -1733,7 +1733,7 @@ static int node_group_make_exec(bContext *C, wmOperator *op) ntreeSolveOrder(snode->nodetree); } - snode_handle_recalc(C, snode); + snode_notify(C, snode); 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; } @@ -1817,11 +1817,12 @@ static int node_mute_exec(bContext *C, wmOperator *op) 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 @@ static int node_delete_exec(bContext *C, wmOperator *op) node_tree_verify_groups(snode->nodetree); - snode_handle_recalc(C, snode); + snode_notify(C, snode); 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... */ ntreeSolveOrder(snode->edittree); - snode_handle_recalc(C, snode); + snode_notify(C, snode); return OPERATOR_FINISHED; } diff --git a/source/blender/editors/space_node/node_header.c b/source/blender/editors/space_node/node_header.c index d8a14c6412b..ed6a45e9736 100644 --- a/source/blender/editors/space_node/node_header.c +++ b/source/blender/editors/space_node/node_header.c @@ -90,7 +90,7 @@ static void do_node_add(bContext *C, void *arg, int event) 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) diff --git a/source/blender/editors/space_node/node_intern.h b/source/blender/editors/space_node/node_intern.h index 8f6d2c81026..723e740a412 100644 --- a/source/blender/editors/space_node/node_intern.h +++ b/source/blender/editors/space_node/node_intern.h @@ -73,7 +73,7 @@ void node_buts_group(struct uiLayout *layout, struct bContext *C, struct Pointer /* 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); |