Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Eisel <julian@blender.org>2021-07-21 20:02:20 +0300
committerJulian Eisel <julian@blender.org>2021-07-21 20:35:39 +0300
commit8de2b6a02020ad0bc4e4ad7868988a37251e3f88 (patch)
treedb5b0dc0e055edb7137de9386652eecaf7d90eb0 /source/blender/blenloader/intern/versioning_300.c
parent952ded57dec6fd5c09a579f1af036e8f9efd7e1e (diff)
Assets: Rename workspace active asset library DNA variable
This new variable was introduced with 7898089de3f2. We don't usually use an `active` prefix variable. Plus, this makes the name match the one of the Asset Browser active library variable, so we can use the `rna_def_asset_library_reference_common()` helper for both. This will cause Asset Views to open with the default "Current File" Asset Library. We could avoid that, but it's a minor issue really.
Diffstat (limited to 'source/blender/blenloader/intern/versioning_300.c')
-rw-r--r--source/blender/blenloader/intern/versioning_300.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c
index 107871586da..2bb64717615 100644
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@ -531,15 +531,6 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
}
FOREACH_NODETREE_END;
-
- {
- if (!DNA_struct_elem_find(
- fd->filesdna, "WorkSpace", "AssetLibraryReference", "active_asset_library")) {
- LISTBASE_FOREACH (WorkSpace *, workspace, &bmain->workspaces) {
- BKE_asset_library_reference_init_default(&workspace->active_asset_library);
- }
- }
- }
}
if (!MAIN_VERSION_ATLEAST(bmain, 300, 10)) {
@@ -582,5 +573,12 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
}
}
+
+ if (!DNA_struct_elem_find(
+ fd->filesdna, "WorkSpace", "AssetLibraryReference", "asset_library")) {
+ LISTBASE_FOREACH (WorkSpace *, workspace, &bmain->workspaces) {
+ BKE_asset_library_reference_init_default(&workspace->asset_library);
+ }
+ }
}
}