[Bf-blender-cvs] [34da7f8fddc] master: Preferences: set dirty flag when dragging
Campbell Barton
noreply at git.blender.org
Tue May 14 03:16:28 CEST 2019
Commit: 34da7f8fddcae003aa9740ba304e624b0154e4d8
Author: Campbell Barton
Date: Tue May 14 11:15:38 2019 +1000
Branches: master
https://developer.blender.org/rB34da7f8fddcae003aa9740ba304e624b0154e4d8
Preferences: set dirty flag when dragging
===================================================================
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 c5a88c5fadb..5c22e37867e 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -551,6 +551,19 @@ static bool ui_but_dragedit_update_mval(uiHandleButtonData *data, int mx)
return true;
}
+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);
+ }
+ }
+}
+
/** \} */
/* -------------------------------------------------------------------- */
@@ -1334,6 +1347,9 @@ static bool ui_drag_toggle_set_xy_xy(
if (do_check) {
ui_but_update_edited(but);
}
+ if (U.runtime.is_dirty == false) {
+ ui_but_update_preferences_dirty(but);
+ }
changed = true;
}
}
@@ -7575,15 +7591,7 @@ static void button_activate_exit(
}
if (U.runtime.is_dirty == false) {
- /* 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);
- }
- }
+ ui_but_update_preferences_dirty(but);
}
}
More information about the Bf-blender-cvs
mailing list