diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-04-23 11:06:29 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-23 11:06:29 +0400 |
commit | 53917c4e3a9afc243a7bc374950b8ed51d4659d6 (patch) | |
tree | 3b53b09921814dd4f809a902b5b24368759aa6fa /release/scripts/startup/bl_ui | |
parent | 511451c8b87f9ab07df15ee36592f1071101b2d0 (diff) |
rna attribute consistency edits, use common prefix for booleans.
Diffstat (limited to 'release/scripts/startup/bl_ui')
14 files changed, 52 insertions, 52 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index 71178e6afac..a99919f68ad 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -936,9 +936,9 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): layout.prop(md, "sharpness") layout.prop(md, "use_smooth_shade") - layout.prop(md, "remove_disconnected_pieces") + layout.prop(md, "use_remove_disconnected") row = layout.row() - row.active = md.remove_disconnected_pieces + row.active = md.use_remove_disconnected row.prop(md, "threshold") @staticmethod diff --git a/release/scripts/startup/bl_ui/properties_freestyle.py b/release/scripts/startup/bl_ui/properties_freestyle.py index fb97dffefb9..b4ab1a733f2 100644 --- a/release/scripts/startup/bl_ui/properties_freestyle.py +++ b/release/scripts/startup/bl_ui/properties_freestyle.py @@ -409,14 +409,14 @@ class RENDERLAYER_PT_freestyle_linestyle(RenderLayerFreestyleEditorButtonsPanel, prop.name = modifier.name elif modifier.type == 'MATERIAL': - box.prop(modifier, "material_attr", text="") + box.prop(modifier, "material_attribute", text="") self.draw_modifier_curve_common(box, modifier, False, True) elif modifier.type == 'CALLIGRAPHY': box.prop(modifier, "orientation") row = box.row(align=True) - row.prop(modifier, "min_thickness") - row.prop(modifier, "max_thickness") + row.prop(modifier, "thickness_min") + row.prop(modifier, "thickness_max") def draw_geometry_modifier(self, context, modifier): layout = self.layout @@ -448,7 +448,7 @@ class RENDERLAYER_PT_freestyle_linestyle(RenderLayerFreestyleEditorButtonsPanel, col.prop(modifier, "octaves") col = split.column() col.prop(modifier, "smooth") - col.prop(modifier, "pure_random") + col.prop(modifier, "use_pure_random") elif modifier.type == 'PERLIN_NOISE_1D': split = box.split() @@ -540,7 +540,7 @@ class RENDERLAYER_PT_freestyle_linestyle(RenderLayerFreestyleEditorButtonsPanel, col.prop(linestyle, "use_chaining", text="Enable Chaining") sub = col.row() sub.active = linestyle.use_chaining - sub.prop(linestyle, "same_object") + sub.prop(linestyle, "use_same_object") # Second column col = split.column() col.active = linestyle.use_chaining @@ -554,15 +554,15 @@ class RENDERLAYER_PT_freestyle_linestyle(RenderLayerFreestyleEditorButtonsPanel, # First column col = split.column() row = col.row(align=True) - row.prop(linestyle, "use_min_angle", text="") + row.prop(linestyle, "use_angle_min", text="") sub = row.row() - sub.active = linestyle.use_min_angle - sub.prop(linestyle, "min_angle") + sub.active = linestyle.use_angle_min + sub.prop(linestyle, "angle_min") row = col.row(align=True) - row.prop(linestyle, "use_max_angle", text="") + row.prop(linestyle, "use_angle_max", text="") sub = row.row() - sub.active = linestyle.use_max_angle - sub.prop(linestyle, "max_angle") + sub.active = linestyle.use_angle_max + sub.prop(linestyle, "angle_max") # Second column col = split.column() row = col.row(align=True) @@ -590,17 +590,17 @@ class RENDERLAYER_PT_freestyle_linestyle(RenderLayerFreestyleEditorButtonsPanel, # First column col = split.column() row = col.row(align=True) - row.prop(linestyle, "use_min_length", text="") + row.prop(linestyle, "use_length_min", text="") sub = row.row() - sub.active = linestyle.use_min_length - sub.prop(linestyle, "min_length") + sub.active = linestyle.use_length_min + sub.prop(linestyle, "length_min") # Second column col = split.column() row = col.row(align=True) - row.prop(linestyle, "use_max_length", text="") + row.prop(linestyle, "use_length_max", text="") sub = row.row() - sub.active = linestyle.use_max_length - sub.prop(linestyle, "max_length") + sub.active = linestyle.use_length_max + sub.prop(linestyle, "length_max") ## Caps layout.label(text="Caps:") diff --git a/release/scripts/startup/bl_ui/properties_game.py b/release/scripts/startup/bl_ui/properties_game.py index 1f05c8eea5a..fcafc7c816a 100644 --- a/release/scripts/startup/bl_ui/properties_game.py +++ b/release/scripts/startup/bl_ui/properties_game.py @@ -407,7 +407,7 @@ class RENDER_PT_game_system(RenderButtonsPanel, Panel): row = col.row() col = row.column() col.prop(gs, "use_frame_rate") - col.prop(gs, "restrict_animation_updates") + col.prop(gs, "use_restrict_animation_updates") col.prop(gs, "use_material_caching") col = row.column() col.prop(gs, "use_display_lists") diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py index ff8cf6ee197..31023d49340 100644 --- a/release/scripts/startup/bl_ui/properties_object.py +++ b/release/scripts/startup/bl_ui/properties_object.py @@ -297,8 +297,8 @@ class OBJECT_PT_relations_extras(ObjectButtonsPanel, Panel): row.active = ((ob.parent is not None) and (ob.use_slow_parent)) row.prop(ob, "slow_parent_offset", text="Offset") - layout.prop(ob, "extra_recalc_object") - layout.prop(ob, "extra_recalc_data") + layout.prop(ob, "use_extra_recalc_object") + layout.prop(ob, "use_extra_recalc_data") from bl_ui.properties_animviz import (MotionPathButtonsPanel, diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py index d4a16b56b43..dc73d5981d7 100644 --- a/release/scripts/startup/bl_ui/properties_particle.py +++ b/release/scripts/startup/bl_ui/properties_particle.py @@ -496,8 +496,8 @@ class PARTICLE_PT_physics(ParticleButtonsPanel, Panel): supports_courant = part.physics_type == 'FLUID' subsub = sub.row() subsub.enabled = supports_courant - subsub.prop(part, "adaptive_subframes", text="") - if supports_courant and part.adaptive_subframes: + subsub.prop(part, "use_adaptive_subframes", text="") + if supports_courant and part.use_adaptive_subframes: col.prop(part, "courant_target", text="Threshold") row = layout.row() @@ -524,20 +524,20 @@ class PARTICLE_PT_physics(ParticleButtonsPanel, Panel): if fluid.solver == 'DDR': sub = col.row() - sub.prop(fluid, "repulsion", slider=fluid.factor_repulsion) - sub.prop(fluid, "factor_repulsion", text="") + sub.prop(fluid, "repulsion", slider=fluid.use_factor_repulsion) + sub.prop(fluid, "use_factor_repulsion", text="") sub = col.row() - sub.prop(fluid, "stiff_viscosity", slider=fluid.factor_stiff_viscosity) - sub.prop(fluid, "factor_stiff_viscosity", text="") + sub.prop(fluid, "stiff_viscosity", slider=fluid.use_factor_stiff_viscosity) + sub.prop(fluid, "use_factor_stiff_viscosity", text="") sub = col.row() - sub.prop(fluid, "fluid_radius", slider=fluid.factor_radius) - sub.prop(fluid, "factor_radius", text="") + sub.prop(fluid, "fluid_radius", slider=fluid.use_factor_radius) + sub.prop(fluid, "use_factor_radius", text="") sub = col.row() - sub.prop(fluid, "rest_density", slider=fluid.factor_density) - sub.prop(fluid, "factor_density", text="") + sub.prop(fluid, "rest_density", slider=fluid.use_factor_density) + sub.prop(fluid, "use_factor_density", text="") if fluid.solver == 'CLASSICAL': # With the classical solver, it is possible to calculate the @@ -563,8 +563,8 @@ class PARTICLE_PT_physics(ParticleButtonsPanel, Panel): col = split.column() col.label(text="Advanced:") sub = col.row() - sub.prop(fluid, "rest_length", slider=fluid.factor_rest_length) - sub.prop(fluid, "factor_rest_length", text="") + sub.prop(fluid, "rest_length", slider=fluid.use_factor_rest_length) + sub.prop(fluid, "use_factor_rest_length", text="") col.label(text="") sub = col.column() sub.active = fluid.use_viscoelastic_springs diff --git a/release/scripts/startup/bl_ui/properties_physics_fluid.py b/release/scripts/startup/bl_ui/properties_physics_fluid.py index 78bb21e76a5..0935f9336e1 100644 --- a/release/scripts/startup/bl_ui/properties_physics_fluid.py +++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py @@ -274,7 +274,7 @@ class PHYSICS_PT_domain_boundary(PhysicButtonsPanel, Panel): col.prop(fluid, "slip_type", text="") if fluid.slip_type == 'PARTIALSLIP': col.prop(fluid, "partial_slip_factor", slider=True, text="Amount") - col.prop(fluid, "surface_noobs") + col.prop(fluid, "use_surface_noobs") col = split.column() col.label(text="Surface:") diff --git a/release/scripts/startup/bl_ui/properties_physics_rigidbody.py b/release/scripts/startup/bl_ui/properties_physics_rigidbody.py index 77ea5a90344..cd701178976 100644 --- a/release/scripts/startup/bl_ui/properties_physics_rigidbody.py +++ b/release/scripts/startup/bl_ui/properties_physics_rigidbody.py @@ -118,7 +118,7 @@ class PHYSICS_PT_rigid_body_dynamics(PHYSICS_PT_rigidbody_panel, Panel): col.prop(rbo, "use_deactivation") sub = col.column() sub.active = rbo.use_deactivation - sub.prop(rbo, "start_deactivated") + sub.prop(rbo, "use_start_deactivated") sub.prop(rbo, "deactivate_linear_velocity", text="Linear Vel") sub.prop(rbo, "deactivate_angular_velocity", text="Angular Vel") # TODO: other params such as time? diff --git a/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py b/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py index a49c6d623ca..202c1c2506e 100644 --- a/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py +++ b/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py @@ -59,10 +59,10 @@ class PHYSICS_PT_rigid_body_constraint(PHYSICS_PT_rigidbody_constraint_panel, Pa sub.prop(rbc, "breaking_threshold", text="Threshold") row = layout.row() - row.prop(rbc, "override_solver_iterations", text="Override Iterations") + row.prop(rbc, "use_override_solver_iterations", text="Override Iterations") sub = row.row() - sub.active = rbc.override_solver_iterations - sub.prop(rbc, "num_solver_iterations", text="Iterations") + sub.active = rbc.use_override_solver_iterations + sub.prop(rbc, "solver_iterations", text="Iterations") if rbc.type == 'HINGE': col = layout.column(align=True) diff --git a/release/scripts/startup/bl_ui/properties_physics_smoke.py b/release/scripts/startup/bl_ui/properties_physics_smoke.py index 487f43aa973..4a1b99ee810 100644 --- a/release/scripts/startup/bl_ui/properties_physics_smoke.py +++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py @@ -93,9 +93,9 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel, Panel): sub = col.column(align=True) - sub.prop(flow, "initial_velocity") + sub.prop(flow, "use_initial_velocity") sub = sub.column() - sub.active = flow.initial_velocity + sub.active = flow.use_initial_velocity sub.prop(flow, "velocity_factor") if flow.smoke_flow_source == "MESH": sub.prop(flow, "velocity_normal") @@ -244,7 +244,7 @@ class PHYSICS_PT_smoke_highres(PhysicButtonsPanel, Panel): col = split.column() col.label(text="Resolution:") col.prop(md, "amplify", text="Divisions") - col.prop(md, "smooth_emitter") + col.prop(md, "use_smooth_emitter") col = split.column() col.label(text="Noise Method:") diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py index eed8c84a389..a04283de8bf 100644 --- a/release/scripts/startup/bl_ui/properties_scene.py +++ b/release/scripts/startup/bl_ui/properties_scene.py @@ -290,7 +290,7 @@ class SCENE_PT_rigid_body_world(SceneButtonsPanel, Panel): col = split.column() col.prop(rbw, "steps_per_second", text="Steps Per Second") - col.prop(rbw, "num_solver_iterations", text="Solver Iterations") + col.prop(rbw, "solver_iterations", text="Solver Iterations") class SCENE_PT_rigid_body_cache(SceneButtonsPanel, Panel): diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 5aadeb1153f..54a788f3e46 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -744,7 +744,7 @@ class IMAGE_PT_tools_brush_texture(BrushButtonsPanel, Panel): row.prop(brush, "use_primary_overlay", toggle=True, text="", icon='RESTRICT_VIEW_ON') sub = row.row() sub.prop(brush, "texture_overlay_alpha", text="Alpha") - sub.prop(brush, "cursor_overlay_override", toggle=True, text="", icon='BRUSH_DATA') + sub.prop(brush, "use_cursor_overlay_override", toggle=True, text="", icon='BRUSH_DATA') @@ -771,7 +771,7 @@ class IMAGE_PT_tools_mask_texture(BrushButtonsPanel, Panel): sub = row.row() sub.prop(brush, "texture_overlay_alpha", text="Alpha") - sub.prop(brush, "cursor_overlay_override", toggle=True, text="", icon='BRUSH_DATA') + sub.prop(brush, "use_cursor_overlay_override", toggle=True, text="", icon='BRUSH_DATA') class IMAGE_PT_tools_brush_tool(BrushButtonsPanel, Panel): diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py index 86f25fd3995..f58679e836d 100644 --- a/release/scripts/startup/bl_ui/space_node.py +++ b/release/scripts/startup/bl_ui/space_node.py @@ -283,7 +283,7 @@ class NODE_PT_quality(bpy.types.Panel): col = layout.column() col.prop(tree, "use_opencl") col.prop(tree, "use_groupnode_buffer") - col.prop(tree, "two_pass") + col.prop(tree, "use_two_pass") col.prop(tree, "use_viewer_border") col.prop(snode, "show_highlight") col.prop(snode, "use_hidden_preview") diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index 641f9fc529f..3477353ba0d 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -98,7 +98,7 @@ class SEQUENCER_HT_header(Header): row.prop(ed, "show_overlay", text="", icon='GHOST_ENABLED') if ed.show_overlay: row.prop(ed, "overlay_frame", text="") - row.prop(ed, "overlay_lock", text="", icon='LOCKED') + row.prop(ed, "use_overlay_lock", text="", icon='LOCKED') row = layout.row() row.prop(st, "overlay_type", text="") diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 8aae19e8bb0..6be5c0e6e04 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -681,7 +681,7 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel): sub = row.row() sub.prop(brush, "cursor_overlay_alpha", text="Alpha") - sub.prop(brush, "cursor_overlay_override", toggle=True, text="", icon='BRUSH_DATA') + sub.prop(brush, "use_cursor_overlay_override", toggle=True, text="", icon='BRUSH_DATA') # Texture Paint Mode # @@ -717,7 +717,7 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel): sub = row.row() sub.prop(brush, "cursor_overlay_alpha", text="Alpha") - sub.prop(brush, "cursor_overlay_override", toggle=True, text="", icon='BRUSH_DATA') + sub.prop(brush, "use_cursor_overlay_override", toggle=True, text="", icon='BRUSH_DATA') # Weight Paint Mode # @@ -774,7 +774,7 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel): sub = row.row() sub.prop(brush, "cursor_overlay_alpha", text="Alpha") - sub.prop(brush, "cursor_overlay_override", toggle=True, text="", icon='BRUSH_DATA') + sub.prop(brush, "use_cursor_overlay_override", toggle=True, text="", icon='BRUSH_DATA') class VIEW3D_PT_tools_brush_texture(Panel, View3DPaintPanel): @@ -814,7 +814,7 @@ class VIEW3D_PT_tools_brush_texture(Panel, View3DPaintPanel): sub = row.row() sub.prop(brush, "texture_overlay_alpha", text="Alpha") - sub.prop(brush, "primary_overlay_override", toggle=True, text="", icon='BRUSH_DATA') + sub.prop(brush, "use_primary_overlay_override", toggle=True, text="", icon='BRUSH_DATA') class VIEW3D_PT_tools_mask_texture(View3DPanel, Panel): @@ -852,7 +852,7 @@ class VIEW3D_PT_tools_mask_texture(View3DPanel, Panel): sub = row.row() sub.prop(brush, "mask_overlay_alpha", text="Alpha") - sub.prop(brush, "secondary_overlay_override", toggle=True, text="", icon='BRUSH_DATA') + sub.prop(brush, "use_secondary_overlay_override", toggle=True, text="", icon='BRUSH_DATA') class VIEW3D_PT_tools_brush_stroke(Panel, View3DPaintPanel): |