Fix access to current preferences when version patching read preferences

The version patch for 0cf9794c7ef0 was checking and setting a data name
using the macros for translation. These would access the current
preferences which can mismatch the ones currently being version patched.
See discussion in 0cf9794c7ef0 for details.

Don't handle translation in this version patch, which is more of a
"nice-to-have" version patch, no functionality depends on it.

1 files changed, 6 insertions, 2 deletions

diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c
index 4234570af6c..3c470a7d3df 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -927,9 +927,13 @@ void blo_do_versions_userdef(UserDef *userdef)
   }
 
   if (!USER_VERSION_ATLEAST(300, 40)) {
-    /* Rename the default asset library from "Default" to "User Library" */
+    /* Rename the default asset library from "Default" to "User Library". This isn't bullet proof
+     * since it doesn't handle translations and ignores user changes. But this was an alpha build
+     * (experimental) feature and the name is just for display in the UI anyway. So it doesn't have
+     * to work perfectly at all. */
     LISTBASE_FOREACH (bUserAssetLibrary *, asset_library, &userdef->asset_libraries) {
-      if (STREQ(asset_library->name, DATA_("Default"))) {
+      /* Ignores translations, since that would depend on the current preferences (global `U`). */
+      if (STREQ(asset_library->name, "Default")) {
         BKE_preferences_asset_library_name_set(
             userdef, asset_library, BKE_PREFS_ASSET_LIBRARY_DEFAULT_NAME);
       }