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:
authorCampbell Barton <ideasman42@gmail.com>2020-10-02 16:36:05 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-10-03 00:25:36 +0300
commitb13459f9e585bcb0e4ba61e391e59a888f5042f2 (patch)
tree449609947a88ad92ab4d99d4a31a48c4a0f66d7e /source/blender/blenloader/intern/versioning_userdef.c
parente255040c7797a282cb0ea614e3f95c6a59cd0298 (diff)
Cleanup: rename main preferences versioning function
BLO_version_defaults_userpref_blend -> blo_do_versions_userdef The name was misleading as it was declared along with BLO_update_defaults_startup_blend making it seem these functions were related. In fact preference defaults don't need to be updated as is done for startup.blend since an in-memory blend file isn't used. Rename the function to match other versioning functions called from readfile.c. Also add/update comments on these differences.
Diffstat (limited to 'source/blender/blenloader/intern/versioning_userdef.c')
-rw-r--r--source/blender/blenloader/intern/versioning_userdef.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c
index da0dd486646..04302935deb 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -44,7 +44,9 @@
#include "BKE_keyconfig.h"
#include "BKE_main.h"
-#include "BLO_readfile.h" /* Own include. */
+#include "BLO_readfile.h"
+
+#include "readfile.h" /* Own include. */
#include "wm_event_types.h"
@@ -244,7 +246,7 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
* Versioning code until next subversion bump goes here.
*
* \note Be sure to check when bumping the version:
- * - #BLO_version_defaults_userpref_blend in this file.
+ * - #blo_do_versions_userdef in this file.
* - "versioning_{BLENDER_VERSION}.c"
*
* \note Keep this message at the bottom of the function.
@@ -303,7 +305,7 @@ static bool keymap_item_has_invalid_wm_context_data_path(wmKeyMapItem *kmi,
}
/* patching UserDef struct and Themes */
-void BLO_version_defaults_userpref_blend(UserDef *userdef)
+void blo_do_versions_userdef(UserDef *userdef)
{
/* #UserDef & #Main happen to have the same struct member. */
#define USER_VERSION_ATLEAST(ver, subver) MAIN_VERSION_ATLEAST(userdef, ver, subver)