Change preference defaults

- Python tooltips: OFF
- Auto Perspective: ON
- Navigation Manipulator: ON
- Region Overlap: ON

See T47064

3 files changed, 13 insertions, 8 deletions

diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c
index 3211ed4fc11..4767ba4e734 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -56,8 +56,7 @@
  */
 void BLO_update_defaults_userpref_blend(void)
 {
-	/* defaults from T37518 */
-
+	/* Defaults from T37518. */
 	U.uiflag |= USER_DEPTH_CURSOR;
 	U.uiflag |= USER_QUIT_PROMPT;
 	U.uiflag |= USER_CONTINUOUS_MOUSE;
@@ -65,12 +64,18 @@ void BLO_update_defaults_userpref_blend(void)
 	/* See T45301 */
 	U.uiflag |= USER_LOCK_CURSOR_ADJUST;
 
+	/* Default from T47064. */
+	U.audiorate = 48000;
+
+	/* Defaults from T54943 (phase 1). */
+	U.flag &= ~USER_TOOLTIPS_PYTHON;
+	U.uiflag |= USER_AUTOPERSP;
+	U.manipulator_flag |= USER_MANIPULATOR_DRAW_NAVIGATE;
+	U.uiflag2 |= USER_REGION_OVERLAP;
+
 	U.versions = 1;
 	U.savetime = 2;
 
-	/* default from T47064 */
-	U.audiorate = 48000;
-
 	/* Keep this a very small, non-zero number so zero-alpha doesn't mask out objects behind it.
 	 * but take care since some hardware has driver bugs here (T46962).
 	 * Further hardware workarounds should be made in gpu_extensions.c */
diff --git a/source/blender/editors/interface/interface_region_tooltip.c b/source/blender/editors/interface/interface_region_tooltip.c
index 3a1c0e7c06e..aa8fe173638 100644
--- a/source/blender/editors/interface/interface_region_tooltip.c
+++ b/source/blender/editors/interface/interface_region_tooltip.c
@@ -513,7 +513,7 @@ static uiTooltipData *ui_tooltip_data_from_button(bContext *C, uiBut *but)
 		WM_operator_pystring_abbreviate(str, 32);
 
 		/* operator info */
-		if ((U.flag & USER_TOOLTIPS_PYTHON) == 0) {
+		if (U.flag & USER_TOOLTIPS_PYTHON) {
 			uiTooltipField *field = text_field_add(
 			        data, &(uiTooltipFormat){
 			            .style = UI_TIP_STYLE_MONO,
@@ -551,7 +551,7 @@ static uiTooltipData *ui_tooltip_data_from_button(bContext *C, uiBut *but)
 		}
 	}
 
-	if ((U.flag & USER_TOOLTIPS_PYTHON) == 0 && !but->optype && rna_struct.strinfo) {
+	if ((U.flag & USER_TOOLTIPS_PYTHON) && !but->optype && rna_struct.strinfo) {
 		{
 			uiTooltipField *field = text_field_add(
 			        data, &(uiTooltipFormat){
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 58fe68bce90..741a1a87eb1 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -3350,7 +3350,7 @@ static void rna_def_userdef_view(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Tooltips", "Display tooltips (when off hold Alt to force display)");
 
 	prop = RNA_def_property(srna, "show_tooltips_python", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", USER_TOOLTIPS_PYTHON);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_TOOLTIPS_PYTHON);
 	RNA_def_property_ui_text(prop, "Python Tooltips", "Show Python references in tooltips");
 
 	prop = RNA_def_property(srna, "show_object_info", PROP_BOOLEAN, PROP_NONE);