diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-01-26 19:04:25 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-01-26 19:04:25 +0300 |
commit | d812e0cb647deb6a6b5b0c2ead44310e751a1aed (patch) | |
tree | 26e3494b559a49682b9cce4f5e587d170e8299d4 /source | |
parent | 9e48cafd6d6a3512a41e98e71d957923fbf3cb1d (diff) |
Blender 2.8: Apparently auto-merge worked incorrect in the merge commit
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenloader/intern/versioning_270.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c index b0fe5cf93ad..477382d8c5b 100644 --- a/source/blender/blenloader/intern/versioning_270.c +++ b/source/blender/blenloader/intern/versioning_270.c @@ -1572,23 +1572,6 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main) } } -} - -void do_versions_after_linking_270(Main *main) -{ - /* To be added to next subversion bump! */ - { - FOREACH_NODETREE(main, ntree, id) { - if (ntree->type == NTREE_COMPOSIT) { - ntreeSetTypes(NULL, ntree); - for (bNode *node = ntree->nodes.first; node; node = node->next) { - if (node->type == CMP_NODE_HUE_SAT) { - do_version_hue_sat_node(ntree, node); - } - } - } - } FOREACH_NODETREE_END - } { if (!DNA_struct_elem_find(fd->filesdna, "View3DDebug", "char", "background")) { @@ -1613,3 +1596,20 @@ void do_versions_after_linking_270(Main *main) } } } + +void do_versions_after_linking_270(Main *main) +{ + /* To be added to next subversion bump! */ + { + FOREACH_NODETREE(main, ntree, id) { + if (ntree->type == NTREE_COMPOSIT) { + ntreeSetTypes(NULL, ntree); + for (bNode *node = ntree->nodes.first; node; node = node->next) { + if (node->type == CMP_NODE_HUE_SAT) { + do_version_hue_sat_node(ntree, node); + } + } + } + } FOREACH_NODETREE_END + } +} |