diff options
Diffstat (limited to 'source/blender/editors/space_node')
| -rw-r--r-- | source/blender/editors/space_node/node_edit.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/space_node/node_relationships.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_node/node_templates.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index 66f0e17db0f..b1cada9752a 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -641,11 +641,11 @@ void ED_node_set_active(Main *bmain, bNodeTree *ntree, bNode *node) Material *ma; World *wo; - for (ma = bmain->mat.first; ma; ma = ma->id.next) + for (ma = bmain->materials.first; ma; ma = ma->id.next) if (ma->nodetree && ma->use_nodes && ntreeHasTree(ma->nodetree, ntree)) GPU_material_free(&ma->gpumaterial); - for (wo = bmain->world.first; wo; wo = wo->id.next) + for (wo = bmain->worlds.first; wo; wo = wo->id.next) if (wo->nodetree && wo->use_nodes && ntreeHasTree(wo->nodetree, ntree)) GPU_material_free(&wo->gpumaterial); @@ -1266,7 +1266,7 @@ static int node_read_viewlayers_exec(bContext *C, wmOperator *UNUSED(op)) ED_preview_kill_jobs(CTX_wm_manager(C), bmain); /* first tag scenes unread */ - for (scene = bmain->scene.first; scene; scene = scene->id.next) + for (scene = bmain->scenes.first; scene; scene = scene->id.next) scene->id.tag |= LIB_TAG_DOIT; for (node = snode->edittree->nodes.first; node; node = node->next) { diff --git a/source/blender/editors/space_node/node_relationships.c b/source/blender/editors/space_node/node_relationships.c index 87e6a7b82a8..e0fce2a5367 100644 --- a/source/blender/editors/space_node/node_relationships.c +++ b/source/blender/editors/space_node/node_relationships.c @@ -129,7 +129,7 @@ static bool node_group_has_output(Main *bmain, bNode *node) if (ntree == NULL) { return false; } - BKE_main_id_tag_listbase(&bmain->nodetree, LIB_TAG_DOIT, false); + BKE_main_id_tag_listbase(&bmain->nodetrees, LIB_TAG_DOIT, false); return node_group_has_output_dfs(node); } diff --git a/source/blender/editors/space_node/node_templates.c b/source/blender/editors/space_node/node_templates.c index 206b32582e5..aef36b49814 100644 --- a/source/blender/editors/space_node/node_templates.c +++ b/source/blender/editors/space_node/node_templates.c @@ -301,7 +301,7 @@ static void ui_node_link_items(NodeLinkArg *arg, int in_out, NodeLinkItem **r_it bNodeTree *ngroup; int i; - for (ngroup = arg->bmain->nodetree.first; ngroup; ngroup = ngroup->id.next) { + for (ngroup = arg->bmain->nodetrees.first; ngroup; ngroup = ngroup->id.next) { ListBase *lb = ((in_out == SOCK_IN) ? &ngroup->inputs : &ngroup->outputs); totitems += BLI_listbase_count(lb); } @@ -310,7 +310,7 @@ static void ui_node_link_items(NodeLinkArg *arg, int in_out, NodeLinkItem **r_it items = MEM_callocN(sizeof(NodeLinkItem) * totitems, "ui node link items"); i = 0; - for (ngroup = arg->bmain->nodetree.first; ngroup; ngroup = ngroup->id.next) { + for (ngroup = arg->bmain->nodetrees.first; ngroup; ngroup = ngroup->id.next) { ListBase *lb = (in_out == SOCK_IN ? &ngroup->inputs : &ngroup->outputs); bNodeSocket *stemp; int index; |