diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-09-30 08:01:12 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-09-30 08:09:00 +0300 |
commit | c0a563ffe814f227411f6b6ce6276a780245ccea (patch) | |
tree | 5d884f48da3e9d26ea3cdf0bbb405ce9a0367b6e | |
parent | e9a663865473db06941063b8ce75d6ff4b3d0884 (diff) |
Cleanup: use 'use_' prefix for RNA booleans
Some of the naming was quite misleading.
10 files changed, 20 insertions, 19 deletions
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index 1164ff82e3c..75d70abf433 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -1150,7 +1150,7 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel): col = layout.column(align=True) if strip_type == 'SPEED': col.prop(strip, "multiply_speed") - col.prop(strip, "frame_interpolation_mode") + col.prop(strip, "use_frame_interpolate") elif strip_type in {'CROSS', 'GAMMA_CROSS', 'WIPE', 'ALPHA_OVER', 'ALPHA_UNDER', 'OVER_DROP'}: col.prop(strip, "use_default_fade", text="Default fade") diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index a8bb032f565..5d51c3a71a4 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -964,7 +964,7 @@ class VIEW3D_PT_tools_weightpaint_symmetry(Panel, View3DPaintPanel): col = layout.column() row = col.row(align=True) row.prop(context.object.data, 'use_mirror_vertex_group_x') - + class VIEW3D_PT_tools_weightpaint_symmetry_for_topbar(Panel): @@ -1555,7 +1555,7 @@ class VIEW3D_PT_tools_grease_pencil_brush_post_processing(View3DPanel, Panel): col1.prop(gp_settings, "simplify_factor") col1 = col.column(align=True) - col1.prop(gp_settings, "trim") + col1.prop(gp_settings, "use_trim") class VIEW3D_PT_tools_grease_pencil_brush_random(View3DPanel, Panel): diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c index 0a8d856863b..eb0146a2eac 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c @@ -246,9 +246,9 @@ static void panel_draw(const bContext *UNUSED(C), Panel *panel) uiLayoutSetPropSep(layout, true); row = uiLayoutRowWithHeading(layout, true, IFACE_("Axis")); - uiItemR(row, ptr, "x_axis", toggles_flag, NULL, ICON_NONE); - uiItemR(row, ptr, "y_axis", toggles_flag, NULL, ICON_NONE); - uiItemR(row, ptr, "z_axis", toggles_flag, NULL, ICON_NONE); + uiItemR(row, ptr, "use_axis_x", toggles_flag, NULL, ICON_NONE); + uiItemR(row, ptr, "use_axis_y", toggles_flag, NULL, ICON_NONE); + uiItemR(row, ptr, "use_axis_z", toggles_flag, NULL, ICON_NONE); uiItemR(layout, ptr, "object", 0, NULL, ICON_NONE); diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c index 9a43766d667..7586bdf2d3f 100644 --- a/source/blender/makesrna/intern/rna_brush.c +++ b/source/blender/makesrna/intern/rna_brush.c @@ -1736,7 +1736,7 @@ static void rna_def_gpencil_options(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Mode", "Preselected mode when using this brush"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); - prop = RNA_def_property(srna, "trim", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_trim", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_BRUSH_TRIM_STROKE); RNA_def_property_boolean_default(prop, false); RNA_def_property_ui_text(prop, "Trim Stroke Ends", "Trim intersecting stroke ends"); diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c index 9bcf2b81557..f8bc5c06963 100644 --- a/source/blender/makesrna/intern/rna_gpencil.c +++ b/source/blender/makesrna/intern/rna_gpencil.c @@ -1200,7 +1200,7 @@ static void rna_def_gpencil_stroke(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_GPencil_update"); /* Cyclic: Draw a line from end to start point */ - prop = RNA_def_property(srna, "draw_cyclic", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_cyclic", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_STROKE_CYCLIC); RNA_def_property_ui_text(prop, "Cyclic", "Enable cyclic drawing, closing the stroke"); RNA_def_property_update(prop, 0, "rna_GPencil_update"); diff --git a/source/blender/makesrna/intern/rna_gpencil_modifier.c b/source/blender/makesrna/intern/rna_gpencil_modifier.c index 9519e3e1433..6a2d3805fa5 100644 --- a/source/blender/makesrna/intern/rna_gpencil_modifier.c +++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c @@ -1876,19 +1876,19 @@ static void rna_def_modifier_gpencilmirror(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Clip", "Clip points"); RNA_def_property_update(prop, 0, "rna_GpencilModifier_update"); - prop = RNA_def_property(srna, "x_axis", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_axis_x", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_MIRROR_AXIS_X); - RNA_def_property_ui_text(prop, "X", "Mirror this axis"); + RNA_def_property_ui_text(prop, "X", "Mirror the X axis"); RNA_def_property_update(prop, 0, "rna_GpencilModifier_update"); - prop = RNA_def_property(srna, "y_axis", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_axis_y", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_MIRROR_AXIS_Y); - RNA_def_property_ui_text(prop, "Y", "Mirror this axis"); + RNA_def_property_ui_text(prop, "Y", "Mirror the Y axis"); RNA_def_property_update(prop, 0, "rna_GpencilModifier_update"); - prop = RNA_def_property(srna, "z_axis", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_axis_z", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_MIRROR_AXIS_Z); - RNA_def_property_ui_text(prop, "Z", "Mirror this axis"); + RNA_def_property_ui_text(prop, "Z", "Mirror the Z axis"); RNA_def_property_update(prop, 0, "rna_GpencilModifier_update"); } diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index ec9dfcc09ea..0070f9873b0 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -6944,7 +6944,7 @@ static void rna_def_modifier_weightednormal(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop = RNA_def_property(srna, "face_influence", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_face_influence", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WEIGHTEDNORMAL_FACE_INFLUENCE); RNA_def_property_ui_text(prop, "Face Influence", "Use influence of face for weighting"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); @@ -7031,7 +7031,8 @@ static void rna_def_modifier_mesh_to_volume(BlenderRNA *brna) RNA_def_property_range(prop, 0, INT_MAX); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop = RNA_def_property(srna, "fill_volume", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_fill_volume", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "fill_volume", 1); RNA_def_property_ui_text( prop, "Fill Volume", "Initialize the density grid in every cell inside the enclosed volume"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index 629dc104ab5..53cbd8522fe 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -2819,7 +2819,7 @@ static void rna_def_speed_control(StructRNA *srna) prop, "Scale to Length", "Scale values from 0.0 to 1.0 to target sequence length"); RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER, "rna_Sequence_invalidate_raw_update"); - prop = RNA_def_property(srna, "frame_interpolation_mode", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_frame_interpolate", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", SEQ_SPEED_USE_INTERPOLATION); RNA_def_property_ui_text( prop, "Frame interpolation", "Do crossfade blending between current and next frame"); diff --git a/source/blender/modifiers/intern/MOD_mesh_to_volume.cc b/source/blender/modifiers/intern/MOD_mesh_to_volume.cc index 4ec8e8fc44e..1cb141feaf4 100644 --- a/source/blender/modifiers/intern/MOD_mesh_to_volume.cc +++ b/source/blender/modifiers/intern/MOD_mesh_to_volume.cc @@ -150,7 +150,7 @@ static void panel_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *col = uiLayoutColumn(layout, false); - uiItemR(col, ptr, "fill_volume", 0, NULL, ICON_NONE); + uiItemR(col, ptr, "use_fill_volume", 0, NULL, ICON_NONE); uiItemR(col, ptr, "exterior_band_width", 0, NULL, ICON_NONE); uiLayout *subcol = uiLayoutColumn(col, false); diff --git a/source/blender/modifiers/intern/MOD_weighted_normal.c b/source/blender/modifiers/intern/MOD_weighted_normal.c index 16c389d3453..2d8669be8e5 100644 --- a/source/blender/modifiers/intern/MOD_weighted_normal.c +++ b/source/blender/modifiers/intern/MOD_weighted_normal.c @@ -731,7 +731,7 @@ static void panel_draw(const bContext *UNUSED(C), Panel *panel) col = uiLayoutColumn(layout, false); uiItemR(col, ptr, "keep_sharp", 0, NULL, ICON_NONE); - uiItemR(col, ptr, "face_influence", 0, NULL, ICON_NONE); + uiItemR(col, ptr, "use_face_influence", 0, NULL, ICON_NONE); modifier_vgroup_ui(layout, ptr, &ob_ptr, "vertex_group", "invert_vertex_group", NULL); |