Commit: 8c131be7693002883c68945faef6eeead88d6c56
Author: Jeroen Bakker
Date: Mon Feb 15 11:16:13 2021 +0100
Branches: compositor-cryptomatte-workflow
https://developer.blender.org/rB8c131be7693002883c68945faef6eeead88d6c56
Removed duplicate versioning code.
===================================================================
M source/blender/blenloader/intern/versioning_290.c
===================================================================
diff --git a/source/blender/blenloader/intern/versioning_290.c
b/source/blender/blenloader/intern/versioning_290.c
index 15fbdb73668..b8ca2f17fd2 100644
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@ -325,18 +325,6 @@ static void seq_convert_transform_crop_lb_2(const Scene
*scene,
}
}
-static void compositor_convert_cryptomatte_node(Main *bmain, bNode *node)
-{
- NodeCryptomatte *storage = (NodeCryptomatte *)node->storage;
-
- char *matte_id = storage->matte_id;
- if (matte_id == NULL || strlen(storage->matte_id) == 0) {
- return;
- }
- BKE_cryptomatte_matte_id_to_entries(bmain, storage, storage->matte_id);
- MEM_SAFE_FREE(storage->matte_id);
-}
-
void do_versions_after_linking_290(Main *bmain, ReportList *UNUSED(reports))
{
if (!MAIN_VERSION_ATLEAST(bmain, 290, 1)) {
@@ -1753,19 +1741,6 @@ void blo_do_versions_290(FileData *fd, Library
*UNUSED(lib), Main *bmain)
}
}
- /* Convert `NodeCryptomatte->storage->matte_id` to
`NodeCryptomatte->storage->entries` */
- if (!DNA_struct_find(fd->filesdna, "CryptomatteEntry")) {
- LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
- if (scene->nodetree) {
- LISTBASE_FOREACH (bNode *, node, &scene->nodetree->nodes) {
- if (node->type == CMP_NODE_CRYPTOMATTE) {
- compositor_convert_cryptomatte_node(bmain, node);
- }
- }
- }
- }
- }
-
/* Keep this block, even when empty. */
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
