archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: use define for key-config string

Browse Source
This commit is contained in:
Campbell Barton
2018-11-19 13:16:18 +11:00
parent 472b114761
commit db8f662cc9
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenloader/intern/versioning_userdef.c
View File

@@ -401,7 +401,7 @@ void BLO_version_defaults_userpref_blend(Main *bmain, UserDef *userdef)
if (!USER_VERSION_ATLEAST(280, 32)) {
if ((userdef->flag & USER_LMOUSESELECT) ) {
userdef->flag &= ~USER_LMOUSESELECT;
wmKeyConfigPref *kpt = BKE_keyconfig_pref_ensure(userdef, "blender");
wmKeyConfigPref *kpt = BKE_keyconfig_pref_ensure(userdef, WM_KEYCONFIG_STR_DEFAULT);
IDP_AddToGroup(kpt->prop, IDP_New(IDP_INT, &(IDPropertyTemplate){ .i = 0, }, "select_mouse"));
}
}

2
source/blender/makesdna/DNA_windowmanager_types.h
View File

@@ -171,6 +171,8 @@ enum {
WM_KEYCONFIG_IS_INITIALIZED = (1<<1),
};
#define WM_KEYCONFIG_STR_DEFAULT "blender"
/* IME is win32 only! */
#ifndef WIN32
# ifdef __GNUC__

6
source/blender/windowmanager/intern/wm.c
View File

@@ -241,13 +241,13 @@ void WM_keyconfig_init(bContext *C)
/* create standard key configs */
if (wm->defaultconf == NULL) {
/* Keep lowercase to match the preset filename. */
wm->defaultconf = WM_keyconfig_new(wm, "blender", false);
wm->defaultconf = WM_keyconfig_new(wm, WM_KEYCONFIG_STR_DEFAULT, false);
}
if (wm->addonconf == NULL) {
wm->addonconf = WM_keyconfig_new(wm, "blender addon", false);
wm->addonconf = WM_keyconfig_new(wm, WM_KEYCONFIG_STR_DEFAULT " addon", false);
}
if (wm->userconf == NULL) {
wm->userconf = WM_keyconfig_new(wm, "blender user", false);
wm->userconf = WM_keyconfig_new(wm, WM_KEYCONFIG_STR_DEFAULT " user", false);
}
/* initialize only after python init is done, for keymaps that