diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-09 16:16:44 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-09 16:17:04 +0300 |
commit | 638de722775fc43c3543a30aaa888372fe93fe98 (patch) | |
tree | 08991e0d3279693dfa8e4fcfec696bfa9f1b2499 /source/blender/editors/space_node/node_edit.c | |
parent | fb565ddb681f39cbe47e91d11e5b728bb4314a7b (diff) |
Cleanup: remove some G.main usages.
Diffstat (limited to 'source/blender/editors/space_node/node_edit.c')
-rw-r--r-- | source/blender/editors/space_node/node_edit.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index 59cfbac2e25..1cb387bb527 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -1132,6 +1132,7 @@ static void node_duplicate_reparent_recursive(bNode *node) static int node_duplicate_exec(bContext *C, wmOperator *op) { + Main *bmain = CTX_data_main(C); SpaceNode *snode = CTX_wm_space_node(C); bNodeTree *ntree = snode->edittree; bNode *node, *newnode, *lastnode; @@ -1139,7 +1140,7 @@ static int node_duplicate_exec(bContext *C, wmOperator *op) const bool keep_inputs = RNA_boolean_get(op->ptr, "keep_inputs"); bool do_tag_update = false; - ED_preview_kill_jobs(CTX_wm_manager(C), CTX_data_main(C)); + ED_preview_kill_jobs(CTX_wm_manager(C), bmain); lastnode = ntree->nodes.last; for (node = ntree->nodes.first; node; node = node->next) { @@ -1216,7 +1217,7 @@ static int node_duplicate_exec(bContext *C, wmOperator *op) node->flag &= ~NODE_ACTIVE; nodeSetSelected(newnode, true); - do_tag_update |= (do_tag_update || node_connected_to_output(ntree, newnode)); + do_tag_update |= (do_tag_update || node_connected_to_output(bmain, ntree, newnode)); } /* make sure we don't copy new nodes again! */ @@ -1586,18 +1587,19 @@ void NODE_OT_hide_socket_toggle(wmOperatorType *ot) static int node_mute_exec(bContext *C, wmOperator *UNUSED(op)) { + Main *bmain = CTX_data_main(C); SpaceNode *snode = CTX_wm_space_node(C); bNode *node; bool do_tag_update = false; - ED_preview_kill_jobs(CTX_wm_manager(C), CTX_data_main(C)); + ED_preview_kill_jobs(CTX_wm_manager(C), bmain); for (node = snode->edittree->nodes.first; node; node = node->next) { /* Only allow muting of nodes having a mute func! */ if ((node->flag & SELECT) && node->typeinfo->update_internal_links) { node->flag ^= NODE_MUTED; snode_update(snode, node); - do_tag_update |= (do_tag_update || node_connected_to_output(snode->edittree, node)); + do_tag_update |= (do_tag_update || node_connected_to_output(bmain, snode->edittree, node)); } } @@ -1628,17 +1630,18 @@ void NODE_OT_mute_toggle(wmOperatorType *ot) static int node_delete_exec(bContext *C, wmOperator *UNUSED(op)) { + Main *bmain = CTX_data_main(C); SpaceNode *snode = CTX_wm_space_node(C); bNode *node, *next; bool do_tag_update = false; - ED_preview_kill_jobs(CTX_wm_manager(C), CTX_data_main(C)); + ED_preview_kill_jobs(CTX_wm_manager(C), bmain); for (node = snode->edittree->nodes.first; node; node = next) { next = node->next; if (node->flag & SELECT) { /* check id user here, nodeFreeNode is called for free dbase too */ - do_tag_update |= (do_tag_update || node_connected_to_output(snode->edittree, node)); + do_tag_update |= (do_tag_update || node_connected_to_output(bmain, snode->edittree, node)); if (node->id) id_us_min(node->id); nodeFreeNode(snode->edittree, node); |