diff options
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index fe4d38e1618..229d0d04423 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -3135,16 +3135,16 @@ static void lib_verify_nodetree(Main *main, int UNUSED(open)) #endif /* set node->typeinfo pointers */ - FOREACH_NODETREE (main, ntree, id) { + FOREACH_NODETREE_BEGIN (main, ntree, id) { ntreeSetTypes(NULL, ntree); - } FOREACH_NODETREE_END + } FOREACH_NODETREE_END; /* verify static socket templates */ - FOREACH_NODETREE (main, ntree, id) { + FOREACH_NODETREE_BEGIN (main, ntree, id) { bNode *node; for (node = ntree->nodes.first; node; node = node->next) node_verify_socket_templates(ntree, node); - } FOREACH_NODETREE_END + } FOREACH_NODETREE_END; { bool has_old_groups = false; @@ -3160,7 +3160,7 @@ static void lib_verify_nodetree(Main *main, int UNUSED(open)) } if (has_old_groups) { - FOREACH_NODETREE (main, ntree, id) { + FOREACH_NODETREE_BEGIN (main, ntree, id) { /* updates external links for all group nodes in a tree */ bNode *node; for (node = ntree->nodes.first; node; node = node->next) { @@ -3170,7 +3170,7 @@ static void lib_verify_nodetree(Main *main, int UNUSED(open)) lib_node_do_versions_group_indices(node); } } - } FOREACH_NODETREE_END + } FOREACH_NODETREE_END; } for (bNodeTree *ntree = main->nodetree.first; ntree; ntree = ntree->id.next) { @@ -3191,7 +3191,7 @@ static void lib_verify_nodetree(Main *main, int UNUSED(open)) * so have to clean up all of them ... */ - FOREACH_NODETREE(main, ntree, id) { + FOREACH_NODETREE_BEGIN(main, ntree, id) { if (ntree->flag & NTREE_DO_VERSIONS_CUSTOMNODES_GROUP) { bNode *input_node = NULL, *output_node = NULL; int num_inputs = 0, num_outputs = 0; @@ -3277,7 +3277,7 @@ static void lib_verify_nodetree(Main *main, int UNUSED(open)) ntree->flag &= ~(NTREE_DO_VERSIONS_CUSTOMNODES_GROUP | NTREE_DO_VERSIONS_CUSTOMNODES_GROUP_CREATE_INTERFACE); } } - FOREACH_NODETREE_END + FOREACH_NODETREE_END; } /* verify all group user nodes */ @@ -3287,10 +3287,10 @@ static void lib_verify_nodetree(Main *main, int UNUSED(open)) /* make update calls where necessary */ { - FOREACH_NODETREE(main, ntree, id) { + FOREACH_NODETREE_BEGIN(main, ntree, id) { /* make an update call for the tree */ ntreeUpdateTree(main, ntree); - } FOREACH_NODETREE_END + } FOREACH_NODETREE_END; } } @@ -6119,8 +6119,7 @@ static void lib_link_scene(FileData *fd, Main *main) BLI_listbase_clear(&seq->anims); lib_link_sequence_modifiers(fd, sce, &seq->modifiers); - } - SEQ_END + } SEQ_END; for (TimeMarker *marker = sce->markers.first; marker; marker = marker->next) { if (marker->camera) { @@ -6406,8 +6405,7 @@ static void direct_link_scene(FileData *fd, Scene *sce) } direct_link_sequence_modifiers(fd, &seq->modifiers); - } - SEQ_END + } SEQ_END; /* link metastack, slight abuse of structs here, have to restore pointer to internal part in struct */ { @@ -9999,8 +9997,7 @@ static void expand_scene(FileData *fd, Main *mainvar, Scene *sce) if (seq->clip) expand_doit(fd, mainvar, seq->clip); if (seq->mask) expand_doit(fd, mainvar, seq->mask); if (seq->sound) expand_doit(fd, mainvar, seq->sound); - } - SEQ_END + } SEQ_END; } if (sce->rigidbody_world) { |