From 8de121ffc677a67d9c8daad4e53a9af006c33834 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 15 Feb 2023 13:11:04 +1100 Subject: [PATCH] Cleanup: use 'show_' prefix for RNA sculpt booleans Follow naming conventions from https://wiki.blender.org/wiki/Source/Architecture/RNA --- release/scripts/startup/bl_ui/space_view3d.py | 12 ++++++------ source/blender/makesrna/intern/rna_space.c | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index a1548741187..9032fb6b4a9 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -6720,15 +6720,15 @@ class VIEW3D_PT_overlay_sculpt(Panel): overlay = view.overlay row = layout.row(align=True) - row.prop(overlay, "sculpt_show_mask", text="") + row.prop(overlay, "show_sculpt_mask", text="") sub = row.row() - sub.active = overlay.sculpt_show_mask + sub.active = overlay.show_sculpt_mask sub.prop(overlay, "sculpt_mode_mask_opacity", text="Mask") row = layout.row(align=True) - row.prop(overlay, "sculpt_show_face_sets", text="") + row.prop(overlay, "show_sculpt_face_sets", text="") sub = row.row() - sub.active = overlay.sculpt_show_face_sets + sub.active = overlay.show_sculpt_face_sets row.prop(overlay, "sculpt_mode_face_sets_opacity", text="Face Sets") @@ -6757,9 +6757,9 @@ class VIEW3D_PT_overlay_sculpt_curves(Panel): row = layout.row(align=True) row.active = overlay.show_overlays - row.prop(overlay, "sculpt_curves_cage", text="") + row.prop(overlay, "show_sculpt_curves_cage", text="") subrow = row.row(align=True) - subrow.active = overlay.sculpt_curves_cage + subrow.active = overlay.show_sculpt_curves_cage subrow.prop(overlay, "sculpt_curves_cage_opacity", text="Cage Opacity") diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 68c3aeb5c83..260e4c5bc7e 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -4714,7 +4714,7 @@ static void rna_def_space_view3d_overlay(BlenderRNA *brna) RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); - prop = RNA_def_property(srna, "sculpt_curves_cage", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "show_sculpt_curves_cage", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "overlay.flag", V3D_OVERLAY_SCULPT_CURVES_CAGE); RNA_def_property_ui_text( prop, "Sculpt Curves Cage", "Show original curves that are currently being edited"); @@ -4733,12 +4733,12 @@ static void rna_def_space_view3d_overlay(BlenderRNA *brna) RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); - prop = RNA_def_property(srna, "sculpt_show_mask", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "show_sculpt_mask", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "overlay.flag", V3D_OVERLAY_SCULPT_SHOW_MASK); RNA_def_property_ui_text(prop, "Sculpt Show Mask", ""); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); - prop = RNA_def_property(srna, "sculpt_show_face_sets", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "show_sculpt_face_sets", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "overlay.flag", V3D_OVERLAY_SCULPT_SHOW_FACE_SETS); RNA_def_property_ui_text(prop, "Sculpt Show Face Sets", ""); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);