Merge branch 'blender-v2.93-release'
This commit is contained in:
commit
79d2f2c2f9
|
@ -24,6 +24,7 @@
|
|||
|
||||
#include "BLI_listbase.h"
|
||||
#include "BLI_math.h"
|
||||
#include "BLI_string.h"
|
||||
#include "BLI_utildefines.h"
|
||||
|
||||
#ifdef WITH_INTERNATIONAL
|
||||
|
@ -841,6 +842,23 @@ void blo_do_versions_userdef(UserDef *userdef)
|
|||
}
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(293, 1)) {
|
||||
/* This rename was made after 2.93.0, harmless to run when it's not needed. */
|
||||
const char *replace_table[][2] = {
|
||||
{"blender", "Blender"},
|
||||
{"blender_27x", "Blender_27x"},
|
||||
{"industry_compatible", "Industry_Compatible"},
|
||||
};
|
||||
const int replace_table_len = ARRAY_SIZE(replace_table);
|
||||
|
||||
BLI_str_replace_table_exact(
|
||||
userdef->keyconfigstr, sizeof(userdef->keyconfigstr), replace_table, replace_table_len);
|
||||
LISTBASE_FOREACH (wmKeyConfigPref *, kpt, &userdef->user_keyconfig_prefs) {
|
||||
BLI_str_replace_table_exact(
|
||||
kpt->idname, sizeof(kpt->idname), replace_table, replace_table_len);
|
||||
}
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(293, 2)) {
|
||||
/* Enable asset browser features by default for alpha testing.
|
||||
* BLO_sanitize_experimental_features_userpref_blend() will disable it again for non-alpha
|
||||
|
|
Loading…
Reference in New Issue