[Bf-blender-cvs] [72e484e88fa] master: Fix preference dirty tagging for addons & keymaps
Campbell Barton
noreply at git.blender.org
Wed May 15 01:49:21 CEST 2019
Commit: 72e484e88fa6f2e66de5c3673a2bce1b2f61e603
Author: Campbell Barton
Date: Wed May 15 09:44:56 2019 +1000
Branches: master
https://developer.blender.org/rB72e484e88fa6f2e66de5c3673a2bce1b2f61e603
Fix preference dirty tagging for addons & keymaps
===================================================================
M source/blender/editors/interface/interface_handlers.c
===================================================================
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index ca5bb945d99..e4adf757c80 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -554,13 +554,26 @@ static bool ui_but_dragedit_update_mval(uiHandleButtonData *data, int mx)
static void ui_but_update_preferences_dirty(uiBut *but)
{
/* Not very elegant, but ensures preference changes force re-save. */
- if (but->rnaprop && (but->rnapoin.data == &U)) {
- /* Exclude navigation from setting dirty. */
- extern PropertyRNA rna_Preferences_active_section;
- if (!ELEM(but->rnaprop, &rna_Preferences_active_section)) {
- U.runtime.is_dirty = true;
- WM_main_add_notifier(NC_WINDOW, NULL);
+ bool tag = false;
+ if (but->rnaprop) {
+ if (but->rnapoin.data == &U) {
+ /* Exclude navigation from setting dirty. */
+ extern PropertyRNA rna_Preferences_active_section;
+ if (!ELEM(but->rnaprop, &rna_Preferences_active_section)) {
+ tag = true;
+ }
}
+ else {
+ StructRNA *base = RNA_struct_base(but->rnapoin.type);
+ if (ELEM(base, &RNA_AddonPreferences, &RNA_KeyConfigPreferences)) {
+ tag = true;
+ }
+ }
+ }
+
+ if (tag) {
+ U.runtime.is_dirty = true;
+ WM_main_add_notifier(NC_WINDOW, NULL);
}
}
More information about the Bf-blender-cvs
mailing list