From 67e7cb6b8a5d2f90c50e13fa7ef447ad7594e09b Mon Sep 17 00:00:00 2001 From: Harley Acheson Date: Wed, 15 Jan 2025 01:21:57 +0100 Subject: [PATCH] UI: Remove RNA Defaults from Negative Boolean Properties Until the refactor of 255f031e3e, Negative Boolean Properties would restore the opposite value for "Reset to Defaults". Now that this works, this PR removes the RNA property defaults that are no longer needed. Pull Request: https://projects.blender.org/blender/blender/pulls/133076 --- source/blender/makesrna/intern/rna_object.cc | 1 - source/blender/makesrna/intern/rna_space.cc | 1 - source/blender/makesrna/intern/rna_userdef.cc | 10 ---------- 3 files changed, 12 deletions(-) diff --git a/source/blender/makesrna/intern/rna_object.cc b/source/blender/makesrna/intern/rna_object.cc index d04ce261eed..783acd50701 100644 --- a/source/blender/makesrna/intern/rna_object.cc +++ b/source/blender/makesrna/intern/rna_object.cc @@ -2689,7 +2689,6 @@ static void rna_def_object_display(BlenderRNA *brna) prop = RNA_def_property(srna, "show_shadows", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, nullptr, "dtx", OB_DRAW_NO_SHADOW_CAST); - RNA_def_property_boolean_default(prop, true); RNA_def_property_ui_text(prop, "Shadow", "Object cast shadows in the 3D viewport"); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, nullptr); diff --git a/source/blender/makesrna/intern/rna_space.cc b/source/blender/makesrna/intern/rna_space.cc index a811f9e262f..6590c3fa97f 100644 --- a/source/blender/makesrna/intern/rna_space.cc +++ b/source/blender/makesrna/intern/rna_space.cc @@ -4365,7 +4365,6 @@ static void rna_def_space_view3d_shading(BlenderRNA *brna) RNA_def_property_boolean_negative_sdna( prop, nullptr, "flag", V3D_SHADING_STUDIOLIGHT_VIEW_ROTATION); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); - RNA_def_property_boolean_default(prop, false); RNA_def_property_ui_text( prop, "World Space Lighting", "Make the HDR rotation fixed and not follow the camera"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D | NS_VIEW3D_SHADING, nullptr); diff --git a/source/blender/makesrna/intern/rna_userdef.cc b/source/blender/makesrna/intern/rna_userdef.cc index 293a6d2a3fa..fb9b92330a2 100644 --- a/source/blender/makesrna/intern/rna_userdef.cc +++ b/source/blender/makesrna/intern/rna_userdef.cc @@ -5194,7 +5194,6 @@ static void rna_def_userdef_view(BlenderRNA *brna) prop = RNA_def_property(srna, "show_splash", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, nullptr, "uiflag", USER_SPLASH_DISABLE); RNA_def_property_ui_text(prop, "Show Splash", "Display splash screen on startup"); - RNA_def_property_boolean_default(prop, true); prop = RNA_def_property(srna, "show_playback_fps", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, nullptr, "uiflag", USER_SHOW_FPS); @@ -5500,7 +5499,6 @@ static void rna_def_userdef_view(BlenderRNA *brna) RNA_def_property_boolean_negative_sdna(prop, nullptr, "text_render", USER_TEXT_DISABLE_AA); RNA_def_property_ui_text( prop, "Text Anti-Aliasing", "Smooth jagged edges of user interface text"); - RNA_def_property_boolean_default(prop, true); RNA_def_property_update(prop, 0, "rna_userdef_text_update"); prop = RNA_def_property(srna, "use_text_render_subpixelaa", PROP_BOOLEAN, PROP_NONE); @@ -5737,7 +5735,6 @@ static void rna_def_userdef_edit(BlenderRNA *brna) prop, "Show Auto Keying Warning", "Show warning indicators when transforming objects and bones if auto keying is enabled"); - RNA_def_property_boolean_default(prop, true); /* keyframing settings */ prop = RNA_def_property(srna, "key_insert_channels", PROP_ENUM, PROP_NONE); @@ -6264,7 +6261,6 @@ static void rna_def_userdef_system(BlenderRNA *brna) prop, "Edit Mode Smooth Wires", "Enable edit mode edge smoothing, reducing aliasing (requires restart)"); - RNA_def_property_boolean_default(prop, true); RNA_def_property_update(prop, 0, "rna_userdef_gpu_update"); prop = RNA_def_property(srna, "use_region_overlap", PROP_BOOLEAN, PROP_NONE); @@ -6370,7 +6366,6 @@ static void rna_def_userdef_system(BlenderRNA *brna) "GPU Depth Picking", "When making a selection in 3D View, use the GPU depth buffer to " "ensure the frontmost object is selected first"); - RNA_def_property_boolean_default(prop, true); /* GPU subdivision evaluation. */ @@ -7261,13 +7256,11 @@ static void rna_def_userdef_filepaths(BlenderRNA *brna) RNA_def_property_boolean_negative_sdna(prop, nullptr, "uiflag", USER_HIDE_RECENT); RNA_def_property_ui_text( prop, "Show Recent Locations", "Show Recent locations list in the File Browser"); - RNA_def_property_boolean_default(prop, true); prop = RNA_def_property(srna, "show_system_bookmarks", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, nullptr, "uiflag", USER_HIDE_SYSTEM_BOOKMARKS); RNA_def_property_ui_text( prop, "Show System Locations", "Show System locations list in the File Browser"); - RNA_def_property_boolean_default(prop, true); prop = RNA_def_property(srna, "use_relative_paths", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, nullptr, "flag", USER_RELPATHS); @@ -7284,7 +7277,6 @@ static void rna_def_userdef_filepaths(BlenderRNA *brna) prop = RNA_def_property(srna, "use_load_ui", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, nullptr, "flag", USER_FILENOUI); RNA_def_property_ui_text(prop, "Load UI", "Load user interface setup when loading .blend files"); - RNA_def_property_boolean_default(prop, true); RNA_def_property_update(prop, 0, "rna_userdef_load_ui_update"); prop = RNA_def_property(srna, "use_scripts_auto_execute", PROP_BOOLEAN, PROP_NONE); @@ -7301,7 +7293,6 @@ static void rna_def_userdef_filepaths(BlenderRNA *brna) prop, "Tabs as Spaces", "Automatically convert all new tabs into spaces for new and loaded text files"); - RNA_def_property_boolean_default(prop, true); prop = RNA_def_property(srna, "use_extension_online_access_handled", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna( @@ -7731,7 +7722,6 @@ void RNA_def_userdef(BlenderRNA *brna) prop = RNA_def_property(srna, "use_recent_searches", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, nullptr, "flag", USER_FLAG_RECENT_SEARCHES_DISABLE); RNA_def_property_ui_text(prop, "Recent Searches", "Sort the recently searched items at the top"); - RNA_def_property_boolean_default(prop, true); /* nested structs */ prop = RNA_def_property(srna, "view", PROP_POINTER, PROP_NONE);