diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-09 16:18:21 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-09 16:18:21 +0300 |
| commit | 70f8eaf1b769c402ec61d86f25237d6b64186861 (patch) | |
| tree | 035d1da0dc7ca1ff1cfefad013181dc0ce3084ed /source/blender/editors/space_node/node_templates.c | |
| parent | 2ca8230f67db3d6c4693d0a2e0997dfd5de43091 (diff) | |
| parent | 638de722775fc43c3543a30aaa888372fe93fe98 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/space_view3d/drawobject.c
Diffstat (limited to 'source/blender/editors/space_node/node_templates.c')
| -rw-r--r-- | source/blender/editors/space_node/node_templates.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/space_node/node_templates.c b/source/blender/editors/space_node/node_templates.c index 5a2feacf20c..23fd793cdd3 100644 --- a/source/blender/editors/space_node/node_templates.c +++ b/source/blender/editors/space_node/node_templates.c @@ -82,11 +82,11 @@ static bool node_link_item_compare(bNode *node, NodeLinkItem *item) return true; } -static void node_link_item_apply(bNode *node, NodeLinkItem *item) +static void node_link_item_apply(Main *bmain, bNode *node, NodeLinkItem *item) { if (node->type == NODE_GROUP) { node->id = (ID *)item->ngroup; - ntreeUpdateTree(G.main, item->ngroup); + ntreeUpdateTree(bmain, item->ngroup); } else { /* nothing to do for now */ @@ -191,6 +191,7 @@ static void node_socket_remove(Main *bmain, bNodeTree *ntree, bNode *node_to, bN static void node_socket_add_replace(const bContext *C, bNodeTree *ntree, bNode *node_to, bNodeSocket *sock_to, int type, NodeLinkItem *item) { + Main *bmain = CTX_data_main(C); bNode *node_from; bNodeSocket *sock_from_tmp; bNode *node_prev = NULL; @@ -233,7 +234,7 @@ static void node_socket_add_replace(const bContext *C, bNodeTree *ntree, bNode * node_from->locy = node_to->locy - (node_from->typeinfo->height * index); } - node_link_item_apply(node_from, item); + node_link_item_apply(bmain, node_from, item); } nodeSetActive(ntree, node_from); |