[Bf-blender-cvs] [42368a2321d] master: Cleanup: RNA boolean names (use prefix conventions)
Campbell Barton
noreply at git.blender.org
Mon Feb 11 07:59:08 CET 2019
Commit: 42368a2321d52d33bf9f49616fd65bbc905840d1
Author: Campbell Barton
Date: Mon Feb 11 17:49:35 2019 +1100
Branches: master
https://developer.blender.org/rB42368a2321d52d33bf9f49616fd65bbc905840d1
Cleanup: RNA boolean names (use prefix conventions)
===================================================================
M release/scripts/startup/bl_ui/properties_data_shaderfx.py
M release/scripts/startup/bl_ui/properties_particle.py
M release/scripts/startup/bl_ui/properties_physics_smoke.py
M release/scripts/startup/bl_ui/space_sequencer.py
M release/scripts/startup/bl_ui/space_userpref.py
M release/scripts/startup/bl_ui/space_view3d.py
M release/scripts/startup/bl_ui/space_view3d_toolbar.py
M source/blender/makesrna/intern/rna_curve.c
M source/blender/makesrna/intern/rna_gpencil_modifier.c
M source/blender/makesrna/intern/rna_particle.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/makesrna/intern/rna_sequencer.c
M source/blender/makesrna/intern/rna_shader_fx.c
M source/blender/makesrna/intern/rna_smoke.c
M source/blender/makesrna/intern/rna_speaker.c
M source/blender/makesrna/intern/rna_userdef.c
===================================================================
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",
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list