From 42368a2321d52d33bf9f49616fd65bbc905840d1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 11 Feb 2019 17:49:35 +1100 Subject: Cleanup: RNA boolean names (use prefix conventions) --- .../scripts/startup/bl_ui/properties_data_shaderfx.py | 2 +- release/scripts/startup/bl_ui/properties_particle.py | 18 +++++++++--------- .../scripts/startup/bl_ui/properties_physics_smoke.py | 4 ++-- release/scripts/startup/bl_ui/space_sequencer.py | 2 +- release/scripts/startup/bl_ui/space_userpref.py | 4 ++-- release/scripts/startup/bl_ui/space_view3d.py | 4 ++-- release/scripts/startup/bl_ui/space_view3d_toolbar.py | 2 +- source/blender/makesrna/intern/rna_curve.c | 2 +- source/blender/makesrna/intern/rna_gpencil_modifier.c | 2 +- source/blender/makesrna/intern/rna_particle.c | 10 +++++----- source/blender/makesrna/intern/rna_scene.c | 2 +- source/blender/makesrna/intern/rna_sequencer.c | 2 +- source/blender/makesrna/intern/rna_shader_fx.c | 2 +- source/blender/makesrna/intern/rna_smoke.c | 2 +- source/blender/makesrna/intern/rna_speaker.c | 2 +- source/blender/makesrna/intern/rna_userdef.c | 2 +- 16 files changed, 31 insertions(+), 31 deletions(-) diff --git a/release/scripts/startup/bl_ui/properties_data_shaderfx.py b/release/scripts/startup/bl_ui/properties_data_shaderfx.py index 8b4bd03bc6d..a0cb7e0fabd 100644 --- a/release/scripts/startup/bl_ui/properties_data_shaderfx.py +++ b/release/scripts/startup/bl_ui/properties_data_shaderfx.py @@ -144,7 +144,7 @@ class DATA_PT_shader_fx(ShaderFxButtonsPanel, Panel): layout.prop(fx, "radius") layout.prop(fx, "angle") - layout.prop(fx, "transparent") + layout.prop(fx, "use_transparent") def FX_FLIP(self, layout, fx): layout.prop(fx, "flip_horizontal") diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py index 55b891c55f5..b1d26b4dbd4 100644 --- a/release/scripts/startup/bl_ui/properties_particle.py +++ b/release/scripts/startup/bl_ui/properties_particle.py @@ -225,7 +225,7 @@ class PARTICLE_PT_context_particles(ParticleButtonsPanel, Panel): else: row = split.row() row.enabled = particle_panel_enabled(context, psys) - row.prop(part, "regrow_hair") + row.prop(part, "use_regrow_hair") row.prop(part, "use_advanced_hair") if psys is not None and psys.is_edited: @@ -709,15 +709,15 @@ class PARTICLE_PT_physics_fluid_advanced(ParticleButtonsPanel, Panel): if fluid.solver == 'DDR': sub = col.column() - sub.prop(fluid, "repulsion", slider=fluid.factor_repulsion) - sub.prop(fluid, "factor_repulsion") + sub.prop(fluid, "repulsion", slider=fluid.use_factor_repulsion) + sub.prop(fluid, "use_factor_repulsion") - sub.prop(fluid, "stiff_viscosity", slider=fluid.factor_stiff_viscosity) - sub.prop(fluid, "factor_stiff_viscosity") + sub.prop(fluid, "stiff_viscosity", slider=fluid.use_factor_stiff_viscosity) + sub.prop(fluid, "use_factor_stiff_viscosity") sub = col.column() - sub.prop(fluid, "fluid_radius", slider=fluid.factor_radius) - sub.prop(fluid, "factor_radius") + sub.prop(fluid, "fluid_radius", slider=fluid.use_factor_radius) + sub.prop(fluid, "use_factor_radius") sub.prop(fluid, "rest_density", slider=fluid.use_factor_density) sub.prop(fluid, "use_factor_density") @@ -821,8 +821,8 @@ class PARTICLE_PT_physics_fluid_springs_advanced(ParticleButtonsPanel, Panel): fluid = part.fluid sub = layout.column() - sub.prop(fluid, "rest_length", slider=fluid.factor_rest_length) - sub.prop(fluid, "factor_rest_length") + sub.prop(fluid, "rest_length", slider=fluid.use_factor_rest_length) + sub.prop(fluid, "use_factor_rest_length") class PARTICLE_PT_physics_boids_movement(ParticleButtonsPanel, Panel): diff --git a/release/scripts/startup/bl_ui/properties_physics_smoke.py b/release/scripts/startup/bl_ui/properties_physics_smoke.py index 1f52f768676..9d170d07c69 100644 --- a/release/scripts/startup/bl_ui/properties_physics_smoke.py +++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py @@ -649,7 +649,7 @@ class PHYSICS_PT_smoke_viewport_display_debug(PhysicButtonsPanel, Panel): def draw_header(self, context): md = context.smoke.domain_settings - self.layout.prop(md, "display_velocity", text="") + self.layout.prop(md, "show_velocity", text="") def draw(self, context): layout = self.layout @@ -659,7 +659,7 @@ class PHYSICS_PT_smoke_viewport_display_debug(PhysicButtonsPanel, Panel): domain = context.smoke.domain_settings col = flow.column() - col.enabled = domain.display_velocity + col.enabled = domain.show_velocity col.prop(domain, "vector_display_type", text="Display As") col.prop(domain, "vector_scale") diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index a757bb4c21d..9f748a923a5 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -742,7 +742,7 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel): layout.prop(strip, "speed_factor") else: layout.prop(strip, "speed_factor", text="Frame Number") - layout.prop(strip, "scale_to_length") + layout.prop(strip, "use_scale_to_length") elif strip.type == 'TRANSFORM': layout = self.layout diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index c36a0f7a354..58582cacc24 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -1983,14 +1983,14 @@ class USERPREF_PT_studiolight_light_editor(Panel): system = prefs.system row = layout.row() - row.prop(system, "edit_studio_light", toggle=True) + row.prop(system, "use_studio_light_edit", toggle=True) row.operator("wm.studiolight_new", text="Save as Studio light", icon='FILE_TICK') layout.separator() layout.use_property_split = True column = layout.split() - column.active = system.edit_studio_light + column.active = system.use_studio_light_edit light = system.solid_lights[0] colsplit = column.split(factor=0.85) diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 0111e49dbf6..a644be0abf0 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -4446,11 +4446,11 @@ class VIEW3D_PT_shading_lighting(Panel): prefs = context.preferences system = prefs.system - if not system.edit_studio_light: + if not system.use_studio_light_edit: sub.scale_y = 0.6 # smaller studiolight preview sub.template_icon_view(shading, "studio_light", scale_popup=3.0) else: - sub.prop(system, "edit_studio_light", text="Disable Studio Light Edit", icon='NONE', toggle=True) + sub.prop(system, "use_studio_light_edit", text="Disable Studio Light Edit", icon='NONE', toggle=True) col = split.column() col.operator("wm.studiolight_userpref_show", emboss=False, text="", icon='PREFERENCES') diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 3bfd2242a7c..2ba84ac166e 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -112,7 +112,7 @@ class VIEW3D_PT_tools_meshedit_options(View3DPanel, Panel): row.active = ob.data.use_mirror_x row.prop(mesh, "use_mirror_topology") - layout.prop(tool_settings, "edge_path_live_unwrap") + layout.prop(tool_settings, "use_edge_path_live_unwrap") layout.prop(tool_settings, "use_mesh_automerge") layout.prop(tool_settings, "double_threshold") diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index ad438f5d25f..0d17251454a 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -1205,7 +1205,7 @@ static void rna_def_charinfo(BlenderRNA *brna) /* probably there is no reason to expose this */ #if 0 - prop = RNA_def_property(srna, "wrap", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_wrap", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_CHINFO_WRAP); RNA_def_property_ui_text(prop, "Wrap", ""); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); */ diff --git a/source/blender/makesrna/intern/rna_gpencil_modifier.c b/source/blender/makesrna/intern/rna_gpencil_modifier.c index 083ba47f590..2bf9487641c 100644 --- a/source/blender/makesrna/intern/rna_gpencil_modifier.c +++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c @@ -1391,7 +1391,7 @@ static void rna_def_modifier_gpencilmirror(BlenderRNA *brna) RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK); RNA_def_property_update(prop, 0, "rna_GpencilModifier_dependency_update"); - prop = RNA_def_property(srna, "clip", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_clip", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_MIRROR_CLIPPING); RNA_def_property_ui_text(prop, "Clip", "Clip points"); RNA_def_property_update(prop, 0, "rna_GpencilModifier_update"); diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index e9a6d03f07e..7abfe80bd74 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -1701,7 +1701,7 @@ static void rna_def_fluid_settings(BlenderRNA *brna) /* Factor flags */ - prop = RNA_def_property(srna, "factor_repulsion", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_factor_repulsion", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SPH_FAC_REPULSION); RNA_def_property_ui_text(prop, "Factor Repulsion", "Repulsion is a factor of stiffness"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); @@ -1712,17 +1712,17 @@ static void rna_def_fluid_settings(BlenderRNA *brna) "Density is calculated as a factor of default density (depends on particle size)"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); - prop = RNA_def_property(srna, "factor_radius", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_factor_radius", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SPH_FAC_RADIUS); RNA_def_property_ui_text(prop, "Factor Radius", "Interaction radius is a factor of 4 * particle size"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); - prop = RNA_def_property(srna, "factor_stiff_viscosity", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_factor_stiff_viscosity", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SPH_FAC_VISCOSITY); RNA_def_property_ui_text(prop, "Factor Stiff Viscosity", "Stiff viscosity is a factor of normal viscosity"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); - prop = RNA_def_property(srna, "factor_rest_length", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_factor_rest_length", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SPH_FAC_REST_LENGTH); RNA_def_property_ui_text(prop, "Factor Rest Length", "Spring rest length is a factor of 2 * particle size"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); @@ -2125,7 +2125,7 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Multi React", "React multiple times"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); - prop = RNA_def_property(srna, "regrow_hair", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_regrow_hair", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_HAIR_REGROW); RNA_def_property_ui_text(prop, "Regrow", "Regrow hair for each frame"); RNA_def_property_update(prop, 0, "rna_Particle_redo"); diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 8c1f8659133..bc48192aa4d 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -2816,7 +2816,7 @@ static void rna_def_tool_settings(BlenderRNA *brna) RNA_def_property_enum_items(prop, edge_tag_items); RNA_def_property_ui_text(prop, "Edge Tag Mode", "The edge flag to tag when selecting the shortest path"); - prop = RNA_def_property(srna, "edge_path_live_unwrap", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_edge_path_live_unwrap", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "edge_mode_live_unwrap", 1); RNA_def_property_ui_text(prop, "Live Unwrap", "Changing edges seam re-calculates UV unwrap"); diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index 2f1d7a52606..d1d182856e8 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -2372,7 +2372,7 @@ static void rna_def_speed_control(StructRNA *srna) RNA_def_property_ui_text(prop, "Use as speed", "Interpret the value as speed instead of a frame number"); RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER, "rna_Sequence_update"); - prop = RNA_def_property(srna, "scale_to_length", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_scale_to_length", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", SEQ_SPEED_COMPRESS_IPO_Y); RNA_def_property_ui_text(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_update"); diff --git a/source/blender/makesrna/intern/rna_shader_fx.c b/source/blender/makesrna/intern/rna_shader_fx.c index 07f56d70e64..664e17af375 100644 --- a/source/blender/makesrna/intern/rna_shader_fx.c +++ b/source/blender/makesrna/intern/rna_shader_fx.c @@ -568,7 +568,7 @@ static void rna_def_shader_fx_swirl(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Angle", "Angle of rotation"); RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_ShaderFx_update"); - prop = RNA_def_property(srna, "transparent", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_transparent", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", FX_SWIRL_MAKE_TRANSPARENT); RNA_def_property_ui_text(prop, "Transparent", "Make image transparent outside of radius"); RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_ShaderFx_update"); diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c index d4996d7a46a..6598a55d40d 100644 --- a/source/blender/makesrna/intern/rna_smoke.c +++ b/source/blender/makesrna/intern/rna_smoke.c @@ -861,7 +861,7 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Interpolation", "Interpolation method to use for smoke/fire volumes in solid mode"); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL); - prop = RNA_def_property(srna, "display_velocity", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "show_velocity", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "draw_velocity", 0); RNA_def_property_ui_text(prop, "Display Velocity", "Toggle visualization of the velocity field as needles"); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL); diff --git a/source/blender/makesrna/intern/rna_speaker.c b/source/blender/makesrna/intern/rna_speaker.c index 66cc9919f95..c01ac95dc14 100644 --- a/source/blender/makesrna/intern/rna_speaker.c +++ b/source/blender/makesrna/intern/rna_speaker.c @@ -57,7 +57,7 @@ static void rna_def_speaker(BlenderRNA *brna) RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_ID_SOUND); /* RNA_def_property_update(prop, 0, "rna_Speaker_update"); */ - prop = RNA_def_property(srna, "relative", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_relative", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SPK_RELATIVE); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Relative", "Whether the source is relative to the camera or not"); diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 38ce8a808a6..603a633dc29 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -4432,7 +4432,7 @@ static void rna_def_userdef_system(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Ambient Color", "Color of the ambient light that uniformly lit the scene"); RNA_def_property_update(prop, 0, "rna_UserDef_viewport_lights_update"); - prop = RNA_def_property(srna, "edit_studio_light", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_studio_light_edit", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "edit_studio_light", 1); RNA_def_property_ui_text(prop, "Edit Studio Light", "View the result of the studio light editor in the viewport"); -- cgit v1.2.3